index-tanked 0.3.0 → 0.3.1

data/generators/index-tanked/templates/migration.rb

@@ -10,10 +10,18 @@ class CreateIndexTankedDocuments < ActiveRecord::Migration
     end
 
     add_index :index_tanked_documents, :locked_at
+    add_index :index_tanked_documents, :locked_by
+    add_index :index_tanked_documents, [:model_name, :record_id]
+    add_index :index_tanked_documents, [:model_name, :record_id, :locked_by], :name => 'index_index_tanked_documents_docid_by_identifier'
+
   end
 
   def self.down
     remove_index :index_tanked_documents, :locked_at
+    remove_index :index_tanked_documents, :locked_by
+    remove_index :index_tanked_documents, [:model_name, :record_id]
+    remove_index :index_tanked_documents, :name => 'index_index_tanked_documents_docid_by_identifier'
+
     drop_table :index_tanked_documents
   end
 end

data/lib/generators/index_tanked/templates/migration.rb

@@ -10,10 +10,18 @@ class CreateIndexTankedDocuments < ActiveRecord::Migration
     end
 
     add_index :index_tanked_documents, :locked_at
+    add_index :index_tanked_documents, :locked_by
+    add_index :index_tanked_documents, [:model_name, :record_id]
+    add_index :index_tanked_documents, [:model_name, :record_id, :locked_by], :name => 'index_index_tanked_documents_docid_by_identifier'
+
   end
 
   def self.down
     remove_index :index_tanked_documents, :locked_at
+    remove_index :index_tanked_documents, :locked_by
+    remove_index :index_tanked_documents, [:model_name, :record_id]
+    remove_index :index_tanked_documents, :name => 'index_index_tanked_documents_docid_by_identifier'
+
     drop_table :index_tanked_documents
   end
 end

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

@@ -14,9 +14,14 @@ module IndexTanked
         end
 
         def inspect
+          return super if read_attribute(:document).nil?
           super.sub(/document: \"[^\"\r\n]*\"/, %{document: #{document.inspect}})
         end
 
+        def newest_record_with_this_docid?
+          self.class.find_by_model_name_and_record_id(self.model_name, self.record_id, :order => 'created_at DESC', :limit => 1) == self
+        end
+
         def self.clear_locks_by_identifier(identifier)
           locks_cleared = update_all(["locked_by = NULL, locked_at = NULL"],
                                      ["locked_by = ?", identifier])
@@ -29,8 +34,28 @@ module IndexTanked
           locks_cleared
         end
 
+        def self.delete_outdated_locked_records_by_identifier(identifier)
+          ids_to_delete = non_unique_docids_by_identifier(identifier).inject([]) do |ids, (model_name, record_id)|
+            record = find_by_model_name_and_record_id_and_locked_by(model_name, record_id, identifier)
+            ids << record.id unless record.newest_record_with_this_docid?
+            ids
+          end
+
+          if ids_to_delete.any?
+            delete_all(['id in (?)', ids_to_delete])
+          else
+            0
+          end
+        end
+
+        def self.non_unique_docids_by_identifier(identifier)
+          find_by_sql(['SELECT model_name, record_id FROM index_tanked_documents GROUP BY model_name, record_id HAVING count(*) > 1 INTERSECT SELECT model_name, record_id FROM index_tanked_documents WHERE locked_by = ?', identifier]).map do |partial_record|
+            [partial_record.model_name, partial_record.record_id]
+          end
+        end
+
         def self.enqueue(record_id, model_name, document_hash)
-          delete_all(:record_id => record_id, :model_name => model_name)
+          delete_all(:record_id => record_id, :model_name => model_name, :locked_by => nil)
           create(:record_id => record_id, :model_name => model_name, :document => document_hash)
         end
 

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

@@ -48,7 +48,9 @@ module IndexTanked
             documents_deleted
           rescue StandardError, Timeout::Error => e
             handle_error(e)
+            outdated_locked_records_deleted = Queue::Document.delete_outdated_locked_records_by_identifier(@identifier)
             locks_cleared = Queue::Document.clear_locks_by_identifier(@identifier)
+            log("#{outdated_locked_records_deleted} outdated locks deleted")
             log("#{locks_cleared} locks cleared")
             0 # return 0 so it sleeps
           end

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.3.0'
+  GEM_VERSION = '0.3.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 -07:00
+date: 2011-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency