enhance(runtime): move subgraph execution batching out

graphql-hive · Feb 6, 2025 · eea5d57 · eea5d57
1 parent 1a9f666
commit eea5d57
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/.changeset/chatty-humans-collect.md b/.changeset/chatty-humans-collect.md
@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/fusion-runtime': patch
+---
+
+Extract subgraph execution batching logic outside, so batching is handled by the Gateway not Stitching
diff --git a/packages/fusion-runtime/package.json b/packages/fusion-runtime/package.json
@@ -48,6 +48,7 @@
     "@graphql-mesh/transport-common": "workspace:^",
     "@graphql-mesh/types": "^0.103.6",
     "@graphql-mesh/utils": "^0.103.6",
+    "@graphql-tools/batch-execute": "^9.0.11",
     "@graphql-tools/delegate": "workspace:^",
     "@graphql-tools/executor": "^1.3.10",
     "@graphql-tools/federation": "workspace:^",

diff --git a/packages/fusion-runtime/src/federation/supergraph.ts b/packages/fusion-runtime/src/federation/supergraph.ts
@@ -158,7 +158,6 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
   onDelegateHooks,
   additionalTypeDefs: additionalTypeDefsFromConfig = [],
   additionalResolvers: additionalResolversFromConfig = [],
-  batch = true,
   logger,
 }: UnifiedGraphHandlerOpts): UnifiedGraphHandlerResult {
   const additionalTypeDefs = [...asArray(additionalTypeDefsFromConfig)];
@@ -204,7 +203,6 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
         stitchingDirectivesTransformer,
         onSubgraphExecute,
       }),
-    batch,
     onStitchingOptions(opts) {
       subschemas = opts.subschemas;
       opts.typeDefs = handleResolveToDirectives(

diff --git a/packages/fusion-runtime/src/unifiedGraphManager.ts b/packages/fusion-runtime/src/unifiedGraphManager.ts
@@ -64,11 +64,6 @@ export interface UnifiedGraphHandlerOpts {
   onDelegationPlanHooks?: OnDelegationPlanHook<any>[];
   onDelegationStageExecuteHooks?: OnDelegationStageExecuteHook<any>[];
   onDelegateHooks?: OnDelegateHook<unknown>[];
-  /**
-   * Whether to batch the subgraph executions.
-   * @default true
-   */
-  batch?: boolean;
 
   logger?: Logger;
 }
@@ -327,7 +322,6 @@ export class UnifiedGraphManager<TContext> implements AsyncDisposable {
           onDelegationPlanHooks: this.onDelegationPlanHooks,
           onDelegationStageExecuteHooks: this.onDelegationStageExecuteHooks,
           onDelegateHooks: this.opts.onDelegateHooks,
-          batch: this.batch,
           logger: this.opts.transportContext?.logger,
         });
         this.unifiedGraph = newUnifiedGraph;
@@ -340,6 +334,7 @@ export class UnifiedGraphManager<TContext> implements AsyncDisposable {
           getSubgraphSchema,
           transportExecutorStack: this._transportExecutorStack,
           getDisposeReason: () => this.disposeReason,
+          batch: this.batch,
         });
         this.inContextSDK = inContextSDK;
         this.lastLoadTime = Date.now();

diff --git a/packages/fusion-runtime/src/utils.ts b/packages/fusion-runtime/src/utils.ts
@@ -13,6 +13,7 @@ import {
   loggerForExecutionRequest,
   requestIdByRequest,
 } from '@graphql-mesh/utils';
+import { createBatchingExecutor } from '@graphql-tools/batch-execute';
 import {
   DelegationPlanBuilder,
   MergedTypeResolver,
@@ -168,6 +169,7 @@ export function getOnSubgraphExecute({
   transportExecutorStack,
   transports,
   getDisposeReason,
+  batch = true,
 }: {
   onSubgraphExecuteHooks: OnSubgraphExecuteHook[];
   transports?: Transports;
@@ -176,6 +178,7 @@ export function getOnSubgraphExecute({
   getSubgraphSchema(subgraphName: string): GraphQLSchema;
   transportExecutorStack: AsyncDisposableStack;
   getDisposeReason?: () => GraphQLError | undefined;
+  batch?: boolean;
 }) {
   const subgraphExecutorMap = new Map<string, Executor>();
   return function onSubgraphExecute(
@@ -219,6 +222,9 @@ export function getOnSubgraphExecute({
             if (isDisposable(executor_)) {
               transportExecutorStack.use(executor_);
             }
+            if (batch) {
+              executor = createBatchingExecutor(executor_);
+            }
             // Wraps the transport executor with hooks
             executor = wrapExecutorWithHooks({
               executor: executor_,

diff --git a/yarn.lock b/yarn.lock
@@ -3481,6 +3481,7 @@ __metadata:
     "@graphql-mesh/transport-common": "workspace:^"
     "@graphql-mesh/types": "npm:^0.103.6"
     "@graphql-mesh/utils": "npm:^0.103.6"
+    "@graphql-tools/batch-execute": "npm:^9.0.11"
     "@graphql-tools/delegate": "workspace:^"
     "@graphql-tools/executor": "npm:^1.3.10"
     "@graphql-tools/federation": "workspace:^"
@@ -3965,7 +3966,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@graphql-tools/batch-execute@workspace:^, @graphql-tools/batch-execute@workspace:packages/batch-execute":
+"@graphql-tools/batch-execute@npm:^9.0.11, @graphql-tools/batch-execute@workspace:^, @graphql-tools/batch-execute@workspace:packages/batch-execute":
   version: 0.0.0-use.local
   resolution: "@graphql-tools/batch-execute@workspace:packages/batch-execute"
   dependencies: