full_search 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffdca4041a68a79686da2b8d636b3feadb88d39fd6ca2ff8f3c6ec955d52355c
-  data.tar.gz: 8438b904a538c0d8c8e0250bf751209b44f8a095aacfc1089cb180a5cbb21d8f
+  metadata.gz: a47cd95db7244715db988cdce15e8466dc2131d3a995769071ca7b513f7b91e4
+  data.tar.gz: 35303e2f06de22ccfcd1e20018d8f1a83cd1d32bd2d883cdd7ba60c1919d3541
 SHA512:
-  metadata.gz: 447a5e7b51909e3098a38439935facf534ad7a97c84eb399af7fbd5e844c966787ac74651a58993000d12b0c18d3a6851fe3ea1e32b854629ff97b5c9e1906a0
-  data.tar.gz: d43d646f9e95ad6bc8d4425c8601b9c5f2695f106965cba1b53881cf8e155581a3421055f1b6babc0468aaf0a02c589e1e615f95dfecb42cd776adebae320bb5
+  metadata.gz: 1316924b824ef6814d2899ee165426b8eee7b021fc7bde0ee358f6a9066f2668561f27fb1de12f12bd0d3b836f91a2d428eb1c9da9e0db7dc494cf037ea707e5
+  data.tar.gz: 3c359e74e2898302ef51ada7f864c22c1b2dd340fb27e5e097b59baa78bae97b800d74ad020f172f202c2da85d3094925aba3fbad9cdc00dc5929fd990803dab

data/lib/full_search/index.rb

@@ -167,8 +167,8 @@ module FullSearch
 
         conn = connection
         begin
-          conn.execute("DELETE FROM #{qt(fts_table_name(model))};")
-          conn.execute("DELETE FROM #{qt(trigram_table_name(model))};") if trigram_table_needed?(model) && trigram_table_exists?(model)
+          with_busy_retry { conn.execute("DELETE FROM #{qt(fts_table_name(model))};") }
+          with_busy_retry { conn.execute("DELETE FROM #{qt(trigram_table_name(model))};") } if trigram_table_needed?(model) && trigram_table_exists?(model)
         rescue ActiveRecord::StatementInvalid => e
           raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
 
@@ -191,12 +191,12 @@ module FullSearch
       # drop the shadow tables directly, then drop the (now-empty) virtual
       # table wrapper, so the caller can recreate a clean index.
       def drop_fts_table_safely!(table_name)
-        connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};")
+        with_busy_retry { connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};") }
       rescue ActiveRecord::StatementInvalid => e
         raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
 
         drop_shadow_tables!(table_name)
-        connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};")
+        with_busy_retry { connection.execute("DROP TABLE IF EXISTS #{qt(table_name)};") }
       end
 
       # FTS5 stores its index data in a fixed set of shadow tables named
@@ -249,12 +249,14 @@ module FullSearch
       def healthy?(model)
         return false unless table_exists?(model)
 
-        connection.execute("SELECT count(*) FROM #{qt(fts_table_name(model))}")
-        true
-      rescue ActiveRecord::StatementInvalid => e
-        raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
+        begin
+          with_busy_retry { connection.execute("SELECT count(*) FROM #{qt(fts_table_name(model))}") }
+          true
+        rescue ActiveRecord::StatementInvalid => e
+          raise unless e.message.match?(/fts5: corruption|invalid fts5 file format|malformed database schema/i)
 
-        false
+          false
+        end
       end
 
       def trigram_table_needed?(model)
@@ -285,6 +287,22 @@ module FullSearch
 
       private
 
+      BUSY_RETRIES = 3
+      BUSY_BACKOFF = 0.1
+
+      def with_busy_retry
+        attempts = 0
+        begin
+          yield
+        rescue ActiveRecord::StatementInvalid => e
+          raise unless e.message.match?(/database is locked/i) && attempts < BUSY_RETRIES
+          attempts += 1
+          sleep(BUSY_BACKOFF * attempts)
+          IndexCache.clear!
+          retry
+        end
+      end
+
       def connection
         ActiveRecord::Base.connection
       end

data/lib/full_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FullSearch
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Ben D'Angelo
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.10
 specification_version: 4
 summary: SQLite FTS5 full-text search for Rails/ActiveRecord
 test_files: []