Merge pull request #3084 from apollographql/jackson/fix-operationName…

…-bug

Fix causing multiple operations to sometimes be incorrectly executed

packages/apollo-gateway/src/__tests__/gateway/queryPlanCache.test.ts

@@ -59,3 +59,52 @@ it('caches the query plan for a request', async () => {
  expect(result.data).toEqual(secondResult.data);
  expect(planner.buildQueryPlan).toHaveBeenCalledTimes(1);
 });
+
+it('supports multiple operations and operationName', async () => {
+ const query = `#graphql
+ query GetUser {
+ me {
+ username
+ }
+ }
+ query GetReviews {
+ topReviews {
+ body
+ }
+ }
+ `;
+
+ const gateway = new ApolloGateway({
+ localServiceList: [accounts, books, inventory, product, reviews],
+ buildService: service => {
+ return new LocalGraphQLDataSource(buildFederatedSchema([service]));
+ },
+ });
+
+ const { schema, executor } = await gateway.load();
+
+ const server = new ApolloServer({ schema, executor });
+
+ const { data: userData } = await server.executeOperation({
+ query,
+ operationName: 'GetUser',
+ });
+
+ const { data: reviewsData } = await server.executeOperation({
+ query,
+ operationName: 'GetReviews',
+ });
+
+ expect(userData).toEqual({
+ me: { username: '@ada' },
+ });
+ expect(reviewsData).toEqual({
+ topReviews: [
+ { body: 'Love it!' },
+ { body: 'Too expensive.' },
+ { body: 'Could be better.' },
+ { body: 'Prefer something else.' },
+ { body: 'Wish I had read this before.' },
+ ],
+ });
+});

packages/apollo-gateway/src/index.ts

@@ -260,14 +260,15 @@ export class ApolloGateway implements GraphQLService {
  >,
  ): Promise<GraphQLExecutionResult> => {
  const { request, document, queryHash } = requestContext;
+ const queryPlanStoreKey = queryHash + (request.operationName || '');
  const operationContext = buildOperationContext(
  this.schema!,
  document,
  request.operationName,
  );
  let queryPlan;
  if (this.queryPlanStore) {
- queryPlan = await this.queryPlanStore.get(queryHash);
+ queryPlan = await this.queryPlanStore.get(queryPlanStoreKey);
  }
 
  if (!queryPlan) {
@@ -285,9 +286,9 @@ export class ApolloGateway implements GraphQLService {
  // While it shouldn't normally be necessary to wrap this `Promise` in a
  // `Promise.resolve` invocation, it seems that the underlying cache store
  // is returning a non-native `Promise` (e.g. Bluebird, etc.).
- Promise.resolve(this.queryPlanStore.set(queryHash, queryPlan)).catch(
- err => this.logger.warn('Could not store queryPlan', err),
- );
+ Promise.resolve(
+ this.queryPlanStore.set(queryPlanStoreKey, queryPlan),
+ ).catch(err => this.logger.warn('Could not store queryPlan', err));
  }
  }