fix: resolve index names

Author: Xetera

src/remote/query-optimizer.ts

@@ -49,6 +49,7 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
   private readonly queries = new Map<QueryHash, OptimizedQuery>();
   private readonly disabledIndexes = new DisabledIndexes();
 
+  private existingIndexes: IndexedTable[] = [];
   private target?: Target;
   private semaphore = new Sema(QueryOptimizer.MAX_CONCURRENCY);
   private _finish = Promise.withResolvers<void>();
@@ -104,6 +105,10 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
     return this.target?.statistics.mode ?? QueryOptimizer.defaultStatistics;
   }
 
+  getExistingIndexes(): IndexedTable[] {
+    return this.existingIndexes;
+  }
+
   getDisabledIndexes(): PgIdentifier[] {
     return [...this.disabledIndexes];
   }
@@ -132,8 +137,8 @@ export class QueryOptimizer extends EventEmitter<EventMap> {
     const pg = this.manager.getOrCreateConnection(this.connectable);
     const ownStats = await Statistics.dumpStats(pg, version, "full");
     const statistics = new Statistics(pg, version, ownStats, statsMode);
-    const existingIndexes = await statistics.getExistingIndexes();
-    const filteredIndexes = this.filterDisabledIndexes(existingIndexes);
+    this.existingIndexes = await statistics.getExistingIndexes();
+    const filteredIndexes = this.filterDisabledIndexes(this.existingIndexes);
     const optimizer = new IndexOptimizer(pg, statistics, filteredIndexes, {
       trace: false,
     });

src/runner.ts

@@ -144,6 +144,15 @@ export class Runner {
     await this.remote.optimizer.finish;
 
     const optimizedQueries = this.remote.optimizer.getQueries();
+    const existingIndexes = this.remote.optimizer.getExistingIndexes();
+
+    const resolveIndexNames = (names: string[]) =>
+      names.map((name) => {
+        const idx = existingIndexes.find((e) => e.index_name === name);
+        return idx
+          ? `${idx.schema_name}.${idx.table_name}(${idx.index_columns.map((c) => `"${c.name}" ${c.order}`).join(", ")})`
+          : name;
+      });
 
     console.log(
       `Matched ${this.remote.optimizer.validQueriesProcessed} queries out of ${total}`,
@@ -157,8 +166,14 @@ export class Runner {
       if (this.ignoredQueryHashes.has(q.hash)) {
         continue;
       }
-      allResults.push(q);
       const { optimization } = q;
+      if (
+        optimization.state === "improvements_available" ||
+        optimization.state === "no_improvement_found"
+      ) {
+        optimization.indexesUsed = resolveIndexNames(optimization.indexesUsed);
+      }
+      allResults.push(q);
       if (optimization.state === "improvements_available") {
         recommendations.push({
           fingerprint: q.hash,