acts_as_solr 1.1.2 → 1.1.3

data/FORKED_CHANGES

@@ -1,3 +1,6 @@
+VERSION 1.1.3
+- improve memory usage (via amuino)
+VERSION 1.1.1
 - highlighting support (needs doc)
 - invalid chars in XML bug fix
 - Raise a specific Exception class on connection error

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/acts_as_solr.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_solr}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]

data/lib/class_methods.rb

@@ -212,20 +212,21 @@ module ActsAsSolr #:nodoc:
         offset = 0
         begin
           iteration_start = Time.now
-          items = finder.call(self, {:limit => limit, :offset => offset})
-          add_batch = items.collect { |content| content.to_solr_doc }
-    
+          items = finder.call(self, {:limit => limit, :offset => offset, :readonly => true})
+          items_processed += items.size
+          last_id = items.last.id if items.last
+          offset += items.size
+
+          items.collect! { |content| content.to_solr_doc }
           if items.size > 0
-            solr_add add_batch
+            solr_add items
             solr_commit
           end
     
-          items_processed += items.size
-          last_id = items.last.id if items.last
           time_so_far = Time.now - start_time
           iteration_time = Time.now - iteration_start         
           logger.info "#{Process.pid}: #{items_processed} items for #{self.name} have been batch added to index in #{'%.3f' % time_so_far}s at #{'%.3f' % (items_processed / time_so_far)} items/sec (#{'%.3f' % (items.size / iteration_time)} items/sec for the last batch). Last id: #{last_id}"
-          offset += items.size
+          
         end while items.nil? || items.size > 0
       else
         items = finder.call(self, {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Kyle Maxwell