index-tanked 0.3.2 → 0.4.0

data/lib/index-tanked/active_record_defaults/instance_methods.rb

@@ -14,7 +14,7 @@ module IndexTanked
       def add_to_index_tank_after_save(fallback=true)
         if index_tanked.dependencies_changed?
           if Configuration.activerecord_queue
-            Document.enqueue(id, self.class.name, index_tanked.document_for_batch_addition)
+            Document.create(:record_id => id, :model_name => self.class.name, :document => index_tanked.document_for_batch_addition)
           else
             add_to_index_tank(fallback)
           end

data/lib/index-tanked/active_record_defaults/queue/document.rb

@@ -54,19 +54,6 @@ module IndexTanked
           end
         end
 
-        def self.enqueue(record_id, model_name, document_hash)
-          retries = 0
-          begin
-            delete_all(:record_id => record_id, :model_name => model_name, :locked_by => nil)
-          rescue ActiveRecord::StatementInvalid => e
-            if e.message.match(/deadlock/) && retries < 3
-              retries += 1
-              retry
-            end
-          end
-          create(:record_id => record_id, :model_name => model_name, :document => document_hash)
-        end
-
         def self.get_or_update_index_information(model_name)
           @model_list ||= {}
           @index_list ||= {}
@@ -106,6 +93,24 @@ module IndexTanked
           end
         end
 
+        def self.remove_duplicate_documents(documents)
+          documents.inject([]) do |documents, document|
+            duplicate_index = index_of_duplicate_document(documents, document)
+            if duplicate_index && (documents[duplicate_index][:fields][:timestamp] < document[:fields][:timestamp])
+              documents[duplicate_index] = document
+            else
+              documents << document
+            end
+            documents
+          end
+        end
+
+        def self.index_of_duplicate_document(document_array, document_to_index)
+          document_array.index do |doc|
+            doc[:docid] == document_to_index[:docid]
+          end
+        end
+
         def self.update_index_list(companion_key, class_companion)
           @index_list[companion_key] = class_companion unless @index_list[companion_key].present?
         end

data/lib/index-tanked/active_record_defaults/queue/worker.rb

@@ -41,7 +41,8 @@ module IndexTanked
           return number_locked if number_locked.zero?
           begin
             documents = Queue::Document.find_all_by_locked_by(@identifier)
-            partitioned_documents = Queue::Document.partition_documents_by_companion_key(documents)
+            documents_without_duplicate_docids = Queue::Document.remove_duplicate_documents(documents)
+            partitioned_documents = Queue::Document.partition_documents_by_companion_key(documents_without_duplicate_docids)
             send_batches_to_indextank(partitioned_documents)
             documents_deleted = Queue::Document.delete_all(:locked_by => @identifier)
             log("#{documents_deleted} completed documents removed from queue.")

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.3.2'
+  GEM_VERSION = '0.4.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -07:00
+date: 2011-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency