full_search 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffdca4041a68a79686da2b8d636b3feadb88d39fd6ca2ff8f3c6ec955d52355c
-  data.tar.gz: 8438b904a538c0d8c8e0250bf751209b44f8a095aacfc1089cb180a5cbb21d8f
+  metadata.gz: f50c2f24f4b4929d3da0744d93e33a0b6c5a6ba3743c4542612c6e1007687691
+  data.tar.gz: d497857811078992322ad4cd081e41aa476878c0950b71a2ec5bcd7a76ff8db2
 SHA512:
-  metadata.gz: 447a5e7b51909e3098a38439935facf534ad7a97c84eb399af7fbd5e844c966787ac74651a58993000d12b0c18d3a6851fe3ea1e32b854629ff97b5c9e1906a0
-  data.tar.gz: d43d646f9e95ad6bc8d4425c8601b9c5f2695f106965cba1b53881cf8e155581a3421055f1b6babc0468aaf0a02c589e1e615f95dfecb42cd776adebae320bb5
+  metadata.gz: bf77188446fed43a0e9f69826f85ced628f5960d493cbd96d721730e9fd9d8c92ffe5c58412aee47e81feb01adca00e2e7b7641f85ea01fe2c98fcaaca05b5f1
+  data.tar.gz: 89e0b8dc7ee2b44391deb5c339e2b048c836431a5997ab19c281285b1fef79fcfe5ad4fea02793a672643899e08e5276a12dbadacf51cb3411853d389c6fbbf7

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/search.rb

@@ -85,7 +85,8 @@ module FullSearch
     def check_stale_config!
       if FullSearch::Index.missing_table?(model)
         if FullSearch.config.auto_rebuild_missing_tables
-          FullSearch::Index.rebuild!(model)
+          FullSearch.logger.info("[full_search] Auto-creating missing FTS table for #{model.table_name}")
+          FullSearch::Index.ensure_table!(model)
           return
         end
 

data/lib/full_search/version.rb

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

data/lib/full_search.rb

@@ -72,6 +72,16 @@ module FullSearch
     def bulk_importing?(model)
       BulkImport.bulk_importing?(model)
     end
+
+    def logger
+      return @logger if defined?(@logger) && @logger
+
+      @logger = if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
+        Rails.logger
+      else
+        Logger.new(File::NULL)
+      end
+    end
   end
 end
 

data/lib/generators/full_search/install/templates/full_search.rb

@@ -5,6 +5,9 @@ FullSearch.configure do |config|
 
   config.auto_rebuild_on_stale_query = Rails.env.local?
 
+  # Auto-create missing FTS tables on first query in dev/test instead of raising.
+  config.auto_rebuild_missing_tables = Rails.env.local?
+
   config.stale_query_behavior = Rails.env.production? ? :log_and_fallback : :raise
 
   config.lock_rebuilds = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full_search
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 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: []