graphql 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85210767fa6162b49189f17ff57be701393a99cc19b78750b6a47004a66d7310
-  data.tar.gz: 4ae9769770245ed92151e4779698ef280c1f22b4d39167c41a5d1ecd337da771
+  metadata.gz: aa975ca1c39b6de261e95d5b4e44f4d65cf3a52d5abeca978a03cb617732c709
+  data.tar.gz: ca123726f134ec05b94176591c0770eb46c4bc2b85202ab90905c2394d3269a5
 SHA512:
-  metadata.gz: 1352340c9daf585df4eac26079530aa1b53f2fca54286505d2884620e0c245178ec2d28435764cf90ec9fb9f2beb4865c7e3a2a457e1db6b74949c600a951bcf
-  data.tar.gz: 2f4145975d6c8e61db4a48a92f0bc676a953c59b180ec2fc9f0b4c7a572ae4b4ac214cc6edbc95e2bfa953a0e2bf29bb73da770efcafabe696b4df2fbbb0f4fc
+  metadata.gz: 18c0b1dbdee834116c64174db429d25176a84dd6cc076c64969995e00b6caa9e8c1fae1f5cdf27b703091515829ac5c2743db3088bb6b290fb1c294ba56c82fb
+  data.tar.gz: b10c8bdb7fb16fbe289542e08237d281bd57a40885aa7176c261f564c32a1250ffe2e94ef767502079f91938c51db059c382fc2ae4c1badebcc9a90746fd85ff

data/lib/graphql/dataloader/source.rb

@@ -168,7 +168,7 @@ module GraphQL
         nil
       end
 
-      attr_reader :pending
+      attr_reader :pending, :results
 
       private
 

data/lib/graphql/dataloader.rb

@@ -118,12 +118,7 @@ module GraphQL
     #
     # @return [void]
     def yield
-      if use_fiber_resume?
-        Fiber.yield
-      else
-        parent_fiber = Thread.current[:parent_fiber]
-        parent_fiber.transfer
-      end
+      Fiber.yield
       nil
     end
 
@@ -168,7 +163,11 @@ module GraphQL
     ensure
       @pending_jobs = prev_queue
       prev_pending_keys.each do |source_instance, pending|
-        source_instance.pending.merge!(pending)
+        pending.each do |key, value|
+          if !source_instance.results.key?(key)
+            source_instance.pending[key] = value
+          end
+        end
       end
     end
 
@@ -178,62 +177,62 @@ module GraphQL
       source_fibers = []
       next_source_fibers = []
       first_pass = true
+      manager = spawn_fiber do
+        while first_pass || job_fibers.any?
+          first_pass = false
 
-      while first_pass || job_fibers.any?
-        first_pass = false
-
-        while (f = job_fibers.shift || spawn_job_fiber)
-          if f.alive?
-            run_fiber(f)
-            next_job_fibers << f
+          while (f = (job_fibers.shift || spawn_job_fiber))
+            if f.alive?
+              finished = run_fiber(f)
+              if !finished
+                next_job_fibers << f
+              end
+            end
           end
-        end
-        join_queues(job_fibers, next_job_fibers)
+          join_queues(job_fibers, next_job_fibers)
 
-        while source_fibers.any? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
-          while (f = source_fibers.shift || spawn_source_fiber)
-            if f.alive?
-              run_fiber(f)
-              next_source_fibers << f
+          while source_fibers.any? || @source_cache.each_value.any? { |group_sources| group_sources.each_value.any?(&:pending?) }
+            while (f = source_fibers.shift || spawn_source_fiber)
+              if f.alive?
+                finished = run_fiber(f)
+                if !finished
+                  next_source_fibers << f
+                end
+              end
             end
+            join_queues(source_fibers, next_source_fibers)
           end
-          join_queues(source_fibers, next_source_fibers)
         end
       end
 
+      run_fiber(manager)
+
+      if manager.alive?
+        raise "Invariant: Manager fiber didn't terminate properly."
+      end
+
       if job_fibers.any?
         raise "Invariant: job fibers should have exited but #{job_fibers.size} remained"
       end
       if source_fibers.any?
         raise "Invariant: source fibers should have exited but #{source_fibers.size} remained"
       end
-
     rescue UncaughtThrowError => e
       throw e.tag, e.value
     end
 
     def run_fiber(f)
-      if use_fiber_resume?
-        f.resume
-      else
-        f.transfer
-      end
+      f.resume
     end
 
     def spawn_fiber
       fiber_vars = get_fiber_variables
-      parent_fiber = use_fiber_resume? ? nil : Fiber.current
       Fiber.new(blocking: !@nonblocking) {
         set_fiber_variables(fiber_vars)
-        Thread.current[:parent_fiber] = parent_fiber
         yield
         # With `.transfer`, you have to explicitly pass back to the parent --
         # if the fiber is allowed to terminate normally, control is passed to the main fiber instead.
-        if parent_fiber
-          parent_fiber.transfer(true)
-        else
-          true
-        end
+        true
       }
     end
 
@@ -245,15 +244,6 @@ module GraphQL
       new_queue.clear
     end
 
-    def use_fiber_resume?
-      Fiber.respond_to?(:scheduler) &&
-        (
-          (defined?(::DummyScheduler) && Fiber.scheduler.is_a?(::DummyScheduler)) ||
-          (defined?(::Evt) && ::Evt::Scheduler.singleton_class::BACKENDS.any? { |be| Fiber.scheduler.is_a?(be) }) ||
-          (defined?(::Libev) && Fiber.scheduler.is_a?(::Libev::Scheduler))
-        )
-    end
-
     def spawn_job_fiber
       if @pending_jobs.any?
         spawn_fiber do

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "2.1.9"
+  VERSION = "2.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.10
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-21 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc