graphiti 1.5.3 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e73347300b459ef189141f41dc56748767b8dfedc7b6b27965da4fa338cdd90
-  data.tar.gz: 2c3dc9a6dc41aa072360fb20c79ec11d7b9663334f023369f32e0822f98f640b
+  metadata.gz: db292ffdb5b46b46d42e012cd68acc342649e28fc6f9cf7c5769db4e0b4bda21
+  data.tar.gz: 2ae2161355c2dccf3fc833831f39eff69639967885e81f25594b75de4fcaca22
 SHA512:
-  metadata.gz: 8144b492f5a20b239caf5616d35a4022cb7df4acc56af08feeae987fdf5ab4157c713f7275ee67947cc993bc8618aeee4808de20da7c27020b79bb5aa4151919
-  data.tar.gz: 116b84208d8095eb7f07ba965a3fe94dcd683568bc1c658edd0be8ae635a2e45e4edcfa109dec80723698b502be6964ea7caae2930ff0f53f0b31db05803a16e
+  metadata.gz: 57306d14268453ee0629e952ff85f23becb6bb2f76b9f238bd7f9030214181020baa3ea227f23d23225cb8e67398a693d1662c2f4d2e64a67629b46a8b47cf16
+  data.tar.gz: a60d925e5fedb2fe79813d128cc5a6f2fb957bce509372c4b22456b04eab2f795bdbd1d1937cdf1176883338845567648e84cc8d7dd03844b0cafefb2f2d140f

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 graphiti changelog
 
+## [1.6.1](https://github.com/graphiti-api/graphiti/compare/v1.6.0...v1.6.1) (2024-03-22)
+
+
+### Bug Fixes
+
+* correct thread-pool mutex logic which was causing a deadlock ([0400ab0](https://github.com/graphiti-api/graphiti/commit/0400ab0d97a1382b66b5295fdc7aa7db680e77cc))
+
+# [1.6.0](https://github.com/graphiti-api/graphiti/compare/v1.5.3...v1.6.0) (2024-03-20)
+
+
+### Features
+
+* add thread pool and concurrency_max_threads configuration option ([#470](https://github.com/graphiti-api/graphiti/issues/470)) ([697d761](https://github.com/graphiti-api/graphiti/commit/697d76172adec24cd7e7522300c8335233fdcc36))
+
 ## [1.5.3](https://github.com/graphiti-api/graphiti/compare/v1.5.2...v1.5.3) (2024-03-18)
 
 

data/lib/graphiti/configuration.rb

@@ -8,6 +8,20 @@ module Graphiti
     #   Defaults to false OR if classes are cached (Rails-only)
     attr_accessor :concurrency
 
+    # This number must be considered in accordance with the database
+    # connection pool size configured in `database.yml`. The connection
+    # pool should be large enough to accommodate both the foreground
+    # threads (ie. web server or job worker threads) and background
+    # threads. For each process, Graphiti will create one global
+    # executor that uses this many threads to sideload resources
+    # asynchronously. Thus, the pool size should be at least
+    # `thread_count + concurrency_max_threads + 1`. For example, if your
+    # web server has a maximum of 3 threads, and
+    # `concurrency_max_threads` is set to 4, then your pool size should
+    # be at least 8.
+    # @return [Integer] Maximum number of threads to use when fetching sideloads concurrently
+    attr_accessor :concurrency_max_threads
+
     attr_accessor :respond_to
     attr_accessor :context_for_endpoint
     attr_accessor :links_on_demand
@@ -26,6 +40,7 @@ module Graphiti
     def initialize
       @raise_on_missing_sideload = true
       @concurrency = false
+      @concurrency_max_threads = 4
       @respond_to = [:json, :jsonapi, :xml]
       @links_on_demand = false
       @pagination_links_on_demand = false

data/lib/graphiti/scope.rb

@@ -2,6 +2,23 @@ module Graphiti
   class Scope
     attr_accessor :object, :unpaginated_object
     attr_reader :pagination
+
+    @thread_pool_executor_mutex = Mutex.new
+
+    def self.thread_pool_executor
+      return @thread_pool_executor if @thread_pool_executor
+
+      concurrency = Graphiti.config.concurrency_max_threads || 4
+      @thread_pool_executor ||= @thread_pool_executor_mutex.synchronize do
+        Concurrent::ThreadPoolExecutor.new(
+          min_threads: 0,
+          max_threads: concurrency,
+          max_queue: concurrency * 4,
+          fallback_policy: :caller_runs
+        )
+      end
+    end
+
     def initialize(object, resource, query, opts = {})
       @object = object
       @resource = resource
@@ -49,7 +66,7 @@ module Graphiti
           @resource.adapter.close if concurrent
         }
         if concurrent
-          promises << Concurrent::Promise.execute(&resolve_sideload)
+          promises << Concurrent::Promise.execute(executor: self.class.thread_pool_executor, &resolve_sideload)
         else
           resolve_sideload.call
         end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.5.3"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.1
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable