Merge pull request cassandra-rb#122 from shyamalprasad/batchkeycount

get_range_batch now correctly counts results for :key_count.

lib/cassandra/cassandra.rb

@@ -741,40 +741,42 @@ def get_range_single(column_family, options = {})
   # range of keys in the column_family you request.
   #
   # If a block is passed in we will yield the row key and columns for
-  # each record returned.
+  # each record returned and return a nil value instead of a Cassandra::OrderedHash.
   #
   # See Cassandra#get_range for more details.
   #
   def get_range_batch(column_family, options = {})
     batch_size    = options.delete(:batch_size) || 100
     count         = options.delete(:key_count)
-    result        = {}
+    result        = (!block_given? && {}) || nil
+    num_results    = 0
 
     options[:start_key] ||= ''
     last_key  = nil
 
-    while options[:start_key] != last_key && (count.nil? || count > result.length)
+    while options[:start_key] != last_key && (count.nil? || count > num_results)
       options[:start_key] = last_key
       res = get_range_single(column_family, options.merge!(:start_key => last_key,
                                                            :key_count => batch_size,
                                                            :return_empty_rows => true
                                                           ))
       res.each do |key, columns|
         next if options[:start_key] == key
-        next if result.length == count
+        next if num_results == count
 
         unless columns == {}
           if block_given?
             yield key, columns
           else
             result[key] = columns
           end
+          num_results += 1
         end
         last_key = key
       end
     end
 
-    result if !block_given?
+    result
   end
 
   ##