chewy 8.3.1 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 810cfb80d064f5c95c437069ca5bed0813f7d443c1e0b229b8454b740f915028
-  data.tar.gz: 6966b7c2cc643031a5194882924bb590d07196bd3e64e3fd885ea6f50a5919ee
+  metadata.gz: c7ffb0b83cbd361f40168edad592083762af5035dc02ca60f205f16c6224a9a6
+  data.tar.gz: ca56cddc2b59646fbaa9188c707c1d9f23d9dabf2166e1a1ff168d83adf6e6ef
 SHA512:
-  metadata.gz: ab138cd69c7e7207cae2e505e7cbf7f8e70b8577a98214d9e23cfff3b9d0b5578de022012b3f35790a6fced795b2974560684ef82590d3947acba0306b1e6151
-  data.tar.gz: f571e4199f796015d2257c21451456085ca3ccb78ca868e2a26f3f636c2f90f0b2ac478bef2d558d03c45bac1e95af185caa08a2ea5e240bc8608fed0cffc4f6
+  metadata.gz: 91751c0575275edd79e08a945fed07b775a6cd0cd216c3fcba95fbab4085b22dd476d23485c63ee93d740b3f2b8e08bc742789e6f60313fcc49d43013bd48ebe
+  data.tar.gz: 4de8630df6346a7eccbbd14ca0cc2b5d84d636e314c58840cae605433a570e6a9b6c07bf8d2f27b695808efcdc491b41006fd4a18038412ee485fe36669711bb

data/CHANGELOG.md

@@ -8,7 +8,29 @@
 
 ### Changes
 
-## 8.3.0 (2026-06-05)
+## 8.4.1 (2026-06-19)
+
+### New Features
+
+### Bug Fixes
+
+* [#1043](https://github.com/toptal/chewy/pull/1043)Fixed `field ..., value: proc(&:method)` (and other splat-declaring procs) raising `ArgumentError: wrong number of arguments` during import. The compiled compose path introduced in 8.4.0 forwarded `crutches`/`context` as extra positional arguments to splat procs; `Symbol#to_proc` then passed them on to the method. Splat procs are now called with the object alone, matching the plain compose path. ([@AlfonsoUceda][])
+
+### Changes
+
+## 8.4.0 (2026-06-17)
+
+### New Features
+
+* [#1036](https://github.com/toptal/chewy/issues/1036): Add `Chewy.close_client` and `Chewy::ElasticClient#close` to explicitly close connections to Elasticsearch, avoiding file descriptor leaks in long-lived multi-threaded processes (e.g. Sidekiq). ([@AlfonsoUceda][])
+
+### Bug Fixes
+
+* ([#1034](https://github.com/toptal/chewy/issues/1034)): Fixed `delayed_sidekiq` strategy raising `TypeError: Unsupported command argument type: Array` on Sidekiq 7+. The LUA scripts now run via `EVALSHA` through a portable helper instead of redis-rb's keyword `eval`, which the redis-client-backed client Sidekiq 7+ yields does not support. ([@AlfonsoUceda][])
+
+### Changes
+
+## 8.3.1 (2026-06-05)
 
 ### New Features
 
@@ -898,6 +920,7 @@
 [@AgeevAndrew]: https://github.com/AgeevAndrew
 [@aglushkov]: https://github.com/aglushkov
 [@AlexVPopov]: https://github.com/AlexVPopov
+[@AlfonsoUceda]: https://github.com/AlfonsoUceda
 [@AndreySavelyev]: https://github.com/AndreySavelyev
 [@afg419]: https://github.com/afg419
 [@arion]: https://github.com/arion

data/README.md

@@ -133,6 +133,23 @@ development:
       ca_file: './tmp/http_ca.crt'
 ```
 
+### Closing connections
+
+`Chewy.client` is memoized per thread, so every thread that touches Chewy gets
+its own client with its own connections to Elasticsearch. Neither
+`elasticsearch-ruby` nor `elastic-transport` expose a public way to close those
+connections, so they are only released when Ruby's garbage collector reclaims
+the client. In long-lived, multi-threaded processes that frequently spawn and
+discard threads (e.g. Sidekiq, which replaces a thread on job failure), this can
+leak file descriptors.
+
+Use `Chewy.close_client` to close the current thread's connections and drop its
+client. The next `Chewy.client` call rebuilds a fresh one:
+
+```ruby
+Chewy.close_client
+```
+
 ### Index
 
 Create `app/chewy/users_index.rb` with User Index:

data/lib/chewy/elastic_client.rb

@@ -12,6 +12,21 @@ module Chewy
       @elastic_client = elastic_client
     end
 
+    # Closes the underlying connections to Elasticsearch.
+    #
+    # Neither elasticsearch-ruby nor elastic-transport expose a public method
+    # to close connections, so they are only released when Ruby's garbage
+    # collector reclaims the client instance. This reaches down to the Faraday
+    # connection of every transport connection and closes it explicitly, which
+    # is useful to avoid file descriptor leaks in long-lived processes that
+    # build a client per thread (e.g. Sidekiq workers).
+    def close
+      @elastic_client.transport.connections.each do |connection|
+        faraday = connection.connection
+        faraday.close if faraday.respond_to?(:close)
+      end
+    end
+
   private
 
     def method_missing(name, *args, **kwargs, &block)

data/lib/chewy/index/compiled.rb

@@ -187,17 +187,24 @@ module Chewy
             idx = @procs.size
             @procs << v
             procs_ref = "compiled_procs[#{idx}]"
-            param_count = positional_param_count(v)
-            case v.arity
-            when 0
+            if v.arity.zero?
               "#{obj_var}.instance_exec(&#{procs_ref})"
+            elsif v.parameters.any? { |type, _| type == :rest }
+              # Procs that declare a splat — Symbol#to_proc (`proc(&:method)`,
+              # parameters `[[:req], [:rest]]`) and `->(*args)` — must NOT
+              # receive crutches/context as extra positional args: a symbol
+              # proc would forward them to the method (`obj.method(crutches,
+              # context)` => "wrong number of arguments"). Mirror the plain
+              # Base#value_by_proc negative-arity branch (`value.call(*object)`)
+              # so the compiled and fallback paths behave identically.
+              "#{procs_ref}.call(*#{obj_var})"
             else
               # Pass only as many of (object, crutches, context) as the
               # proc actually declares. This keeps lambdas with optional
               # args (negative arity like `->(o, c=nil)`) from being
               # called with too many arguments. Anything beyond context
               # truncates to all three.
-              args = [obj_var, 'crutches', 'context'].first(param_count)
+              args = [obj_var, 'crutches', 'context'].first(positional_param_count(v))
               "#{procs_ref}.call(#{args.join(', ')})"
             end
           else
@@ -212,14 +219,13 @@ module Chewy
           end
         end
 
-        # Number of positional parameters declared by `proc`, counting
-        # required + optional. Splats and keyword args contribute one
-        # bucket each so the caller still passes all three context args.
+        # Number of (object, crutches, context) args to pass to a splat-free
+        # proc: its required + optional positional parameters, capped at the
+        # three available. Splat procs are handled by the caller and never
+        # reach here.
         def positional_param_count(proc)
-          params = proc.parameters
-          required = params.count { |type, _| %i[req opt].include?(type) }
-          has_splat = params.any? { |type, _| type == :rest }
-          has_splat ? 3 : [required, 3].min
+          required = proc.parameters.count { |type, _| %i[req opt].include?(type) }
+          [required, 3].min
         end
 
         def safe_identifier?(name)

data/lib/chewy/index/import/bulk_builder.rb

@@ -47,7 +47,7 @@ module Chewy
         end
 
         def index_entry(object)
-          return [] if @fields&.empty?
+          return [] if @fields && @fields.empty?
 
           entry = {}
           entry[:_id] = index_object_ids[object] if index_object_ids[object]

data/lib/chewy/strategy/delayed_sidekiq/redis_script.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Chewy
+  class Strategy
+    class DelayedSidekiq
+      # Runs a LUA script through whatever client `Sidekiq.redis` yields.
+      #
+      # redis-rb (Sidekiq <= 6) accepts `eval(script, keys:, argv:)`, but the
+      # real Sidekiq 7+ runtime yields a redis-client-backed CompatClient that
+      # has no `#eval` and forwards the keyword args as a nested array, raising
+      # `TypeError: Unsupported command argument type: Array` (issue #971).
+      #
+      # `evalsha(sha, keys_array, argv_array)` is the one form both clients
+      # expand to the flat `EVALSHA sha numkeys *keys *argv` shape, so we load
+      # the script once and call it by digest, reloading on NOSCRIPT.
+      module RedisScript
+        def self.call(redis, script, keys:, argv:)
+          reloaded = false
+          begin
+            shas[script] ||= redis.script(:load, script)
+            redis.evalsha(shas[script], keys, argv)
+          rescue StandardError => e
+            raise if reloaded || !e.message.to_s.include?('NOSCRIPT')
+
+            reloaded = true
+            shas.delete(script) # flushed cache or failover: reload and retry once
+            retry
+          end
+        end
+
+        def self.shas
+          @shas ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/chewy/strategy/delayed_sidekiq/scheduler.rb

@@ -10,6 +10,7 @@ require_relative '../../index'
 module Chewy
   class Strategy
     class DelayedSidekiq
+      require_relative 'redis_script'
       require_relative 'worker'
 
       LUA_SCRIPT = <<~LUA
@@ -98,7 +99,7 @@ module Chewy
         def postpone
           ::Sidekiq.redis do |redis|
             # do the redis stuff in a single command to avoid concurrency issues
-            if redis.eval(LUA_SCRIPT, keys: [timechunk_key, timechunks_key], argv: [serialize_data, at, ttl])
+            if RedisScript.call(redis, LUA_SCRIPT, keys: [timechunk_key, timechunks_key], argv: [serialize_data, at, ttl])
               ::Sidekiq::Client.push(
                 'queue' => sidekiq_queue,
                 'at' => at + margin,

data/lib/chewy/strategy/delayed_sidekiq/worker.rb

@@ -39,7 +39,7 @@ module Chewy
           options[:refresh] = !Chewy.disable_refresh_async if Chewy.disable_refresh_async
 
           ::Sidekiq.redis do |redis|
-            members = redis.eval(LUA_SCRIPT, keys: [], argv: [type, score, Scheduler::KEY_PREFIX])
+            members = RedisScript.call(redis, LUA_SCRIPT, keys: [], argv: [type, score, Scheduler::KEY_PREFIX])
 
             # extract ids and fields & do the reset of records
             ids, fields = extract_ids_and_fields(members)

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '8.3.1'.freeze
+  VERSION = '8.4.1'.freeze
 end

data/lib/chewy.rb

@@ -102,6 +102,21 @@ module Chewy
       Chewy.current[:chewy_client] ||= Chewy::ElasticClient.new
     end
 
+    # Closes the current thread's client connections to Elasticsearch and
+    # drops the thread-local client, so the next `Chewy.client` call builds a
+    # fresh one.
+    #
+    # Useful in long-lived multi-threaded processes (e.g. Sidekiq) where the
+    # per-thread client would otherwise keep its connections open until the
+    # dead thread is garbage collected, leaking file descriptors.
+    def close_client
+      client = Chewy.current[:chewy_client]
+      return unless client
+
+      client.close
+      Chewy.current[:chewy_client] = nil
+    end
+
     # Sends wait_for_status request to ElasticSearch with status
     # defined in configuration.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 8.3.1
+  version: 8.4.1
 platform: ruby
 authors:
 - Toptal, LLC
@@ -174,6 +174,7 @@ files:
 - lib/chewy/strategy/base.rb
 - lib/chewy/strategy/bypass.rb
 - lib/chewy/strategy/delayed_sidekiq.rb
+- lib/chewy/strategy/delayed_sidekiq/redis_script.rb
 - lib/chewy/strategy/delayed_sidekiq/scheduler.rb
 - lib/chewy/strategy/delayed_sidekiq/worker.rb
 - lib/chewy/strategy/lazy_sidekiq.rb
@@ -202,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Elasticsearch ODM client wrapper
 test_files: []