fix: improve query performance (#7099)

Author: n1ru4l

integration-tests/testkit/utils.ts

@@ -102,3 +102,12 @@ export function generateUnique() {
     capitalize: false,
   });
 }
+
+export function assertNonNull<T>(
+  value: T | null,
+  message = 'Expected non-null value.',
+): asserts value is T {
+  if (value === null) {
+    throw new Error(message);
+  }
+}

integration-tests/tests/api/schema/delete.spec.ts

@@ -3,7 +3,7 @@ import { parse, print } from 'graphql';
 import { updateSchemaComposition } from 'testkit/flow';
 import { ProjectType } from 'testkit/gql/graphql';
 import { initSeed } from 'testkit/seed';
-import { getServiceHost } from 'testkit/utils';
+import { assertNonNull, getServiceHost } from 'testkit/utils';
 import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
 import { createStorage } from '@hive/storage';
 import { sortSDL } from '@theguild/federation-composition';
@@ -171,11 +171,12 @@ test.concurrent(
         .then(r => r.expectNoGraphQLErrors());
       expect(deleteServiceResult.schemaDelete.__typename).toBe('SchemaDeleteSuccess');
 
-      const latestVersion = await storage.getLatestVersion({
+      const latestVersion = await storage.getMaybeLatestVersion({
         targetId: target.id,
         projectId: project.id,
         organizationId: organization.id,
       });
+      assertNonNull(latestVersion);
 
       expect(latestVersion.compositeSchemaSDL).toMatchInlineSnapshot(`
         type Query {
@@ -302,11 +303,12 @@ test.concurrent(
         .then(r => r.expectNoGraphQLErrors());
       expect(deleteServiceResult.schemaDelete.__typename).toBe('SchemaDeleteSuccess');
 
-      const latestVersion = await storage.getLatestVersion({
+      const latestVersion = await storage.getMaybeLatestVersion({
         targetId: target.id,
         projectId: project.id,
         organizationId: organization.id,
       });
+      assertNonNull(latestVersion);
 
       expect(latestVersion.compositeSchemaSDL).toEqual(null);
       expect(latestVersion.schemaCompositionErrors).toMatchInlineSnapshot(`

integration-tests/tests/api/schema/publish.spec.ts

@@ -4,7 +4,7 @@ import { graphql } from 'testkit/gql';
 /* eslint-disable no-process-env */
 import { ProjectType } from 'testkit/gql/graphql';
 import { execute } from 'testkit/graphql';
-import { getServiceHost } from 'testkit/utils';
+import { assertNonNull, getServiceHost } from 'testkit/utils';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { createStorage } from '@hive/storage';
 import { createTarget, publishSchema, updateSchemaComposition } from '../../../testkit/flow';
@@ -606,11 +606,12 @@ describe('schema publishing changes are persisted', () => {
         return;
       }
 
-      const latestVersion = await storage.getLatestVersion({
+      const latestVersion = await storage.getMaybeLatestVersion({
         targetId: target.id,
         projectId: project.id,
         organizationId: organization.id,
       });
+      assertNonNull(latestVersion);
 
       const changes = await storage.getSchemaChangesForVersion({
         versionId: latestVersion.id,
@@ -2710,11 +2711,12 @@ test('Target.schemaVersion: result is read from the database', async () => {
       return;
     }
 
-    const latestVersion = await storage.getLatestVersion({
+    const latestVersion = await storage.getMaybeLatestVersion({
       targetId: target.id,
       projectId: project.id,
       organizationId: organization.id,
     });
+    assertNonNull(latestVersion);
 
     const result = await execute({
       document: SchemaCompareToPreviousVersionQuery,
@@ -2842,11 +2844,12 @@ test('Composition Error (Federation 2) can be served from the database', async (
       return;
     }
 
-    const latestVersion = await storage.getLatestVersion({
+    const latestVersion = await storage.getMaybeLatestVersion({
       targetId: target.id,
       projectId: project.id,
       organizationId: organization.id,
     });
+    assertNonNull(latestVersion);
 
     const result = await execute({
       document: SchemaCompareToPreviousVersionQuery,
@@ -2994,11 +2997,12 @@ test('Composition Network Failure (Federation 2)', async () => {
       return;
     }
 
-    const latestVersion = await storage.getLatestVersion({
+    const latestVersion = await storage.getMaybeLatestVersion({
       targetId: target.id,
       projectId: project.id,
       organizationId: organization.id,
     });
+    assertNonNull(latestVersion);
 
     const result = await execute({
       document: SchemaCompareToPreviousVersionQuery,

packages/services/api/src/modules/shared/providers/storage.ts

@@ -361,8 +361,6 @@ export interface Storage {
 
   getMaybeLatestValidVersion(_: { targetId: string }): Promise<SchemaVersion | null | never>;
 
-  getLatestVersion(_: TargetSelector): Promise<SchemaVersion | never>;
-
   getMaybeLatestVersion(_: TargetSelector): Promise<SchemaVersion | null>;
 
   /** Find the version before a schema version */

packages/services/storage/src/index.ts

@@ -2023,31 +2023,17 @@ export async function createStorage(
 
       return SchemaVersionModel.parse(version);
     },
-    async getLatestVersion(args) {
-      const version = await pool.maybeOne<unknown>(
-        sql`/* getLatestVersion */
-          SELECT
-            ${schemaVersionSQLFields(sql`sv.`)}
-          FROM schema_versions as sv
-          LEFT JOIN targets as t ON (t.id = sv.target_id)
-          WHERE sv.target_id = ${args.targetId} AND t.project_id = ${args.projectId}
-          ORDER BY sv.created_at DESC
-          LIMIT 1
-        `,
-      );
-
-      return SchemaVersionModel.parse(version);
-    },
-
     async getMaybeLatestVersion(args) {
       const version = await pool.maybeOne<unknown>(
         sql`/* getMaybeLatestVersion */
           SELECT
             ${schemaVersionSQLFields(sql`sv.`)}
-          FROM schema_versions as sv
-          LEFT JOIN targets as t ON (t.id = sv.target_id)
-          WHERE sv.target_id = ${args.targetId} AND t.project_id = ${args.projectId}
-          ORDER BY sv.created_at DESC
+          FROM
+            "schema_versions" AS "sv"
+          WHERE
+            "sv"."target_id" = ${args.targetId}
+          ORDER BY
+            "sv"."created_at" DESC
           LIMIT 1
         `,
       );