graphiti 1.6.2 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7e9a22a29df9a53ef4c2da7a6bb102c4407f21201440cd0888015c2442895b5
-  data.tar.gz: 405ed0c5ee38118ef4b535bc5751dcb960630117ca9ca1706b69bb91eda6df4a
+  metadata.gz: 60dd55a9db78fcc197c66de85b88bd69e840462d77a679dbb76fcd41b040dbe1
+  data.tar.gz: e6a2cdefe4435864ea9101c94ac122d3c11ba0e85b7284f19a08f5ec4a3cee0d
 SHA512:
-  metadata.gz: fa1bbea7813069ac8c97bacdb7d298162bc55121771974693264c81b5b85da9420aef3d3c0509e96013f9266861e6a0e8dc61853e88dcb88b7cc7c9ddf83fa99
-  data.tar.gz: 9929dda99cd0fecbbac7939c1a161f43f20944921950cf8f4e8bb30c30251fcbf1f253364ee7fe4c7c442e4eafb7d74c6c2cb6347835f7cdbc71713c31938639
+  metadata.gz: 2264e0a1313762c00ffb96fbb80c60bbc7d6406e37fedc8eef0a9b813b6bc5d5ff9443ca165d2afcf7499c61f9746a0d851b699b9ec5f90ba5ca74c16932c428
+  data.tar.gz: 74d51069de9047b07d213c628889766d54d8e8c43812d75a433247e70bc2b027dc7735e310bd0460a36e37083c7a9306dddbeb5d15b0160987cb8f5a65daaa93

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 graphiti changelog
 
+## [1.6.4](https://github.com/graphiti-api/graphiti/compare/v1.6.3...v1.6.4) (2024-03-27)
+
+## [1.6.3](https://github.com/graphiti-api/graphiti/compare/v1.6.2...v1.6.3) (2024-03-26)
+
+
+### Bug Fixes
+
+* Remove thread pool executor logic until we get a better handle on what's causing thread pool hangs. refs [#469](https://github.com/graphiti-api/graphiti/issues/469) ([7941b6f](https://github.com/graphiti-api/graphiti/commit/7941b6f75ce1001b034ed6e83c148b893e9f3d99)), closes [#471](https://github.com/graphiti-api/graphiti/issues/471) [#470](https://github.com/graphiti-api/graphiti/issues/470)
+
 ## [1.6.2](https://github.com/graphiti-api/graphiti/compare/v1.6.1...v1.6.2) (2024-03-22)
 
 

data/lib/graphiti/configuration.rb

@@ -8,20 +8,6 @@ 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
@@ -40,7 +26,6 @@ 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/resource/interface.rb

@@ -5,7 +5,7 @@ module Graphiti
 
       class_methods do
         def all(params = {}, base_scope = nil)
-          validate!(params)
+          validate_request!(params)
           _all(params, {}, base_scope)
         end
 
@@ -17,7 +17,7 @@ module Graphiti
         end
 
         def find(params = {}, base_scope = nil)
-          validate!(params)
+          validate_request!(params)
           _find(params, base_scope)
         end
 
@@ -38,14 +38,14 @@ module Graphiti
         end
 
         def build(params, base_scope = nil)
-          validate!(params)
+          validate_request!(params)
           runner = Runner.new(self, params)
           runner.proxy(base_scope, single: true, raise_on_missing: true)
         end
 
         private
 
-        def validate!(params)
+        def validate_request!(params)
           return if Graphiti.context[:graphql] || !validate_endpoints?
 
           if context&.respond_to?(:request)

data/lib/graphiti/resource_proxy.rb

@@ -74,6 +74,7 @@ module Graphiti
       end
     end
     alias_method :to_a, :data
+    alias_method :resolve_data, :data
 
     def meta
       @meta ||= data.respond_to?(:meta) ? data.meta : {}
@@ -136,7 +137,7 @@ module Graphiti
     end
 
     def destroy
-      data
+      resolve_data
       transaction_response = @resource.transaction do
         metadata = {method: :destroy}
         model = @resource.destroy(@query.filters[:id], metadata)
@@ -154,7 +155,7 @@ module Graphiti
     end
 
     def update
-      data
+      resolve_data
       save(action: :update)
     end
 

data/lib/graphiti/scope.rb

@@ -2,23 +2,6 @@ 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_mutex.synchronize do
-        @@thread_pool_executor ||= 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
@@ -66,7 +49,7 @@ module Graphiti
           @resource.adapter.close if concurrent
         }
         if concurrent
-          promises << Concurrent::Promise.execute(executor: self.class.thread_pool_executor, &resolve_sideload)
+          promises << Concurrent::Promise.execute(&resolve_sideload)
         else
           resolve_sideload.call
         end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.6.2"
+  VERSION = "1.6.4"
 end

metadata

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