searchkick 5.1.2 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a4b2478d1c1353f7117fff60a08a50c896a1b78e150abf1a6b328901933e4d
-  data.tar.gz: 1ff1fac4e47194445ca9f0ec2a470b7f15fe9aeb135960aa874e1a6beff62a2e
+  metadata.gz: cd5ad80ede7109fee3886bc0e5c27b8f2e4a39ed9530ac3a0c4683d8281dcd7c
+  data.tar.gz: 41c8736fc385b97d14ee1f0aef72cd8fbefad6d171dae879066901af5481fef1
 SHA512:
-  metadata.gz: 52f8ccfb7f3615492a1674c7d48878b31bc9fd4e8cb8c411fbb19020d910c1ce395764aa1e378fab8e59294a7f5ef0bd2db0f9cd32c728dd302984ded4c7f20d
-  data.tar.gz: 0c26ce9bb674b6aa5744edfd8567024a1f1d50fb30b6096abcdfdc23c73a71afbb9310a56809cc135b2d30653e1330cfa057fd9778e005a2aeeb1d354d7686af
+  metadata.gz: a8dd0e09fe48cc48e240d295fd350734bfe787e06611a5f3637e4b9d7e81afa327ea42fbe5912024c06bbe6de55ecbb41ecac57d98d6194bf7d94e34d89eb39c
+  data.tar.gz: ba98108eda0e4cb2d3884e3402246ad2c269a11438d6eb62ee2346b2cbfe6dd2c4e2865df5ed52bfef6faf3dbc031dc4ca3d6aefb0c5d7487b347b496bd3b29e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.2.1 (2023-02-21)
+
+- Added support for `redis-client` gem
+
+## 5.2.0 (2023-02-08)
+
+- Added model name to warning about missing records
+- Fixed unnecessary data loading when reindexing relations with `:async` and `:queue` modes
+
 ## 5.1.2 (2023-01-29)
 
 - Fixed error with missing point in time

data/README.md

@@ -1837,6 +1837,10 @@ To query nested data, use dot notation.
 Product.search("san", fields: ["store.city"], where: {"store.zip_code" => 12345})
 ```
 
+## Nearest Neighbors
+
+You can use custom mapping and searching to index vectors and perform k-nearest neighbor search. See the examples for [Elasticsearch](examples/elasticsearch_knn.rb) and [OpenSearch](examples/opensearch_knn.rb).
+
 ## Reference
 
 Reindex one record

data/lib/searchkick/reindex_queue.rb

@@ -10,7 +10,7 @@ module Searchkick
 
     # supports single and multiple ids
     def push(record_ids)
-      Searchkick.with_redis { |r| r.lpush(redis_key, record_ids) }
+      Searchkick.with_redis { |r| r.call("LPUSH", redis_key, record_ids) }
     end
 
     def push_records(records)
@@ -34,11 +34,11 @@ module Searchkick
     # TODO use reliable queuing
     def reserve(limit: 1000)
       if supports_rpop_with_count?
-        Searchkick.with_redis { |r| r.call("rpop", redis_key, limit) }.to_a
+        Searchkick.with_redis { |r| r.call("RPOP", redis_key, limit) }.to_a
       else
         record_ids = []
         Searchkick.with_redis do |r|
-          while record_ids.size < limit && (record_id = r.rpop(redis_key))
+          while record_ids.size < limit && (record_id = r.call("RPOP", redis_key))
             record_ids << record_id
           end
         end
@@ -47,11 +47,11 @@ module Searchkick
     end
 
     def clear
-      Searchkick.with_redis { |r| r.del(redis_key) }
+      Searchkick.with_redis { |r| r.call("DEL", redis_key) }
     end
 
     def length
-      Searchkick.with_redis { |r| r.llen(redis_key) }
+      Searchkick.with_redis { |r| r.call("LLEN", redis_key) }
     end
 
     private
@@ -65,7 +65,12 @@ module Searchkick
     end
 
     def redis_version
-      @redis_version ||= Searchkick.with_redis { |r| Gem::Version.new(r.info["redis_version"]) }
+      @redis_version ||=
+        Searchkick.with_redis do |r|
+          info = r.call("INFO")
+          matches = /redis_version:(\S+)/.match(info)
+          Gem::Version.new(matches[1])
+        end
     end
 
     def escape(value)

data/lib/searchkick/relation_indexer.rb

@@ -14,12 +14,17 @@ module Searchkick
         relation = relation.search_import
       end
 
-      # remove unneeded loading for async
-      if mode == :async
+      # remove unneeded loading for async and queue
+      if mode == :async || mode == :queue
         if relation.respond_to?(:primary_key)
-          relation = relation.select(relation.primary_key).except(:includes, :preload)
+          relation = relation.except(:includes, :preload)
+          unless mode == :queue && relation.klass.method_defined?(:search_routing)
+            relation = relation.except(:select).select(relation.primary_key)
+          end
         elsif relation.respond_to?(:only)
-          relation = relation.only(:_id)
+          unless mode == :queue && relation.klass.method_defined?(:search_routing)
+            relation = relation.only(:_id)
+          end
         end
       end
 
@@ -42,11 +47,11 @@ module Searchkick
     end
 
     def batches_left
-      Searchkick.with_redis { |r| r.scard(batches_key) }
+      Searchkick.with_redis { |r| r.call("SCARD", batches_key) }
     end
 
     def batch_completed(batch_id)
-      Searchkick.with_redis { |r| r.srem(batches_key, [batch_id]) }
+      Searchkick.with_redis { |r| r.call("SREM", batches_key, [batch_id]) }
     end
 
     private
@@ -134,7 +139,7 @@ module Searchkick
     end
 
     def batch_job(class_name, batch_id, record_ids)
-      Searchkick.with_redis { |r| r.sadd(batches_key, [batch_id]) }
+      Searchkick.with_redis { |r| r.call("SADD", batches_key, [batch_id]) }
       Searchkick::BulkReindexJob.perform_later(
         class_name: class_name,
         index_name: index.name,

data/lib/searchkick/results.rb

@@ -304,7 +304,7 @@ module Searchkick
     def build_hits
       @build_hits ||= begin
         if missing_records.any?
-          Searchkick.warn("Records in search index do not exist in database: #{missing_records.map { |v| v[:id] }.join(", ")}")
+          Searchkick.warn("Records in search index do not exist in database: #{missing_records.map { |v| "#{v[:model].model_name} #{v[:id]}" }.join(", ")}")
         end
         with_hit_and_missing_records[0]
       end

data/lib/searchkick/version.rb

@@ -1,3 +1,3 @@
 module Searchkick
-  VERSION = "5.1.2"
+  VERSION = "5.2.1"
 end

data/lib/searchkick.rb

@@ -10,27 +10,27 @@ require "hashie"
 require "forwardable"
 
 # modules
-require "searchkick/controller_runtime"
-require "searchkick/index"
-require "searchkick/index_cache"
-require "searchkick/index_options"
-require "searchkick/indexer"
-require "searchkick/hash_wrapper"
-require "searchkick/log_subscriber"
-require "searchkick/model"
-require "searchkick/multi_search"
-require "searchkick/query"
-require "searchkick/reindex_queue"
-require "searchkick/record_data"
-require "searchkick/record_indexer"
-require "searchkick/relation"
-require "searchkick/relation_indexer"
-require "searchkick/results"
-require "searchkick/version"
-require "searchkick/where"
+require_relative "searchkick/controller_runtime"
+require_relative "searchkick/index"
+require_relative "searchkick/index_cache"
+require_relative "searchkick/index_options"
+require_relative "searchkick/indexer"
+require_relative "searchkick/hash_wrapper"
+require_relative "searchkick/log_subscriber"
+require_relative "searchkick/model"
+require_relative "searchkick/multi_search"
+require_relative "searchkick/query"
+require_relative "searchkick/reindex_queue"
+require_relative "searchkick/record_data"
+require_relative "searchkick/record_indexer"
+require_relative "searchkick/relation"
+require_relative "searchkick/relation_indexer"
+require_relative "searchkick/results"
+require_relative "searchkick/version"
+require_relative "searchkick/where"
 
 # integrations
-require "searchkick/railtie" if defined?(Rails)
+require_relative "searchkick/railtie" if defined?(Rails)
 
 module Searchkick
   # requires faraday

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchkick
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Intelligent search made easy with Rails and Elasticsearch or OpenSearch