Merge pull request #5132 from cardstack/search-timing-sql-split

Split realm-server search-timing sql stage into compile vs sqlExec

Author: habdelra

packages/runtime-common/index-query-engine.ts

@@ -73,6 +73,7 @@ import {
 import { isScopedCSSRequest } from './scoped-css';
 import type { FileMetaResource } from './resource-types';
 import type { VirtualNetwork } from './virtual-network';
+import type { RequestTimings } from './request-timings';
 
 export interface IndexedFile {
   type: 'file';
@@ -139,7 +140,8 @@ interface InstanceError extends Partial<
 export type InstanceOrError = IndexedInstance | InstanceError;
 
 type GetEntryOptions = WIPOptions;
-export type QueryOptions = WIPOptions & PrerenderedCardOptions;
+export type QueryOptions = WIPOptions &
+  PrerenderedCardOptions & { timings?: RequestTimings };
 
 interface PrerenderedCardOptions {
   htmlFormat?: PrerenderedHtmlFormat;
@@ -197,8 +199,20 @@ export class IndexQueryEngine {
     return await query(this.#dbAdapter, expression, coerceTypes);
   }
 
-  async #queryCards(query: CardExpression) {
-    return this.#query(await this.makeExpression(query));
+  // Split the two phases so the search-timing line can attribute the SQL
+  // stage. `makeExpression` resolves the filter tree to SQL — that resolution
+  // runs a `getDefinition` card-definition lookup per type/field (a cache
+  // read, or a module prerender on a miss), so it can dominate a search whose
+  // actual row fetch is tiny. `#query` is the DB round-trip itself. The data
+  // and count queries run concurrently, so these accumulate into the
+  // parallel-sum `busy` bucket rather than the wall-clock stages.
+  async #queryCards(query: CardExpression, timings?: RequestTimings) {
+    let expression = timings
+      ? await timings.busyTime('compile', () => this.makeExpression(query))
+      : await this.makeExpression(query);
+    return timings
+      ? await timings.busyTime('sqlExec', () => this.#query(expression))
+      : this.#query(expression);
   }
 
   async getInstance(
@@ -608,8 +622,8 @@ export class IndexQueryEngine {
       ];
 
       let [results, totalResults] = await Promise.all([
-        this.#queryCards(query),
-        this.#queryCards(queryCount),
+        this.#queryCards(query, opts.timings),
+        this.#queryCards(queryCount, opts.timings),
       ]);
 
       return {