@query-doctor/core 0.2.1 → 0.2.3

package/dist/index.cjs

@@ -1172,17 +1172,17 @@ var _IndexOptimizer = class _IndexOptimizer {
     }
     const baseIndexes = this.findUsedIndexes(baseExplain.Plan);
     const finalIndexes = this.findUsedIndexes(finalExplain.Plan);
+    const triedIndexes = new Map(
+      toCreate.map((index) => [index.name.toString(), index])
+    );
+    this.replaceUsedIndexesWithDefinition(finalExplain.Plan, triedIndexes);
     return {
       kind: "ok",
       baseCost,
       finalCost,
       newIndexes: finalIndexes.newIndexes,
       existingIndexes: baseIndexes.existingIndexes,
-      triedIndexes: new Map(
-        // TODO: don't prematurely stringify PgIdentifier here
-        // (requires more work)
-        toCreate.map((index) => [index.name.toString(), index])
-      ),
+      triedIndexes,
       baseExplainPlan: baseExplain.Plan,
       explainPlan: finalExplain.Plan
     };
@@ -1401,8 +1401,8 @@ var _IndexOptimizer = class _IndexOptimizer {
     const newIndexes = /* @__PURE__ */ new Set();
     const existingIndexes = /* @__PURE__ */ new Set();
     const prefix = _IndexOptimizer.prefix;
-    function go(plan) {
-      const indexName = plan["Index Name"];
+    walkExplain(explain, (stage) => {
+      const indexName = stage["Index Name"];
       if (indexName) {
         if (indexName.startsWith(prefix)) {
           newIndexes.add(indexName);
@@ -1413,21 +1413,37 @@ var _IndexOptimizer = class _IndexOptimizer {
           existingIndexes.add(indexName);
         }
       }
-      if (plan.Plans) {
-        for (const p of plan.Plans) {
-          go(p);
-        }
-      }
-    }
-    go(explain);
+    });
     return {
       newIndexes,
       existingIndexes
     };
   }
+  replaceUsedIndexesWithDefinition(explain, triedIndexes) {
+    walkExplain(explain, (stage) => {
+      const indexName = stage["Index Name"];
+      if (typeof indexName === "string") {
+        const recommendation = triedIndexes.get(indexName);
+        if (recommendation) {
+          stage["Index Name"] = recommendation.definition;
+        }
+      }
+    });
+  }
 };
 __publicField(_IndexOptimizer, "prefix", "__qd_");
 var IndexOptimizer = _IndexOptimizer;
+function walkExplain(explain, f) {
+  function go(plan) {
+    f(plan);
+    if (plan.Plans) {
+      for (const p of plan.Plans) {
+        go(p);
+      }
+    }
+  }
+  go(explain);
+}
 var RollbackError = class {
   constructor(value) {
     this.value = value;