@rocicorp/zero 0.25.0-canary.6 → 0.25.0-canary.7

package/out/{chunk-WWNKZSEE.js → chunk-FODUNUAD.js}

@@ -4981,7 +4981,10 @@ var PlannerFanIn = class {
       scanEst: 0,
       startupCost: 0,
       selectivity: 0,
-      limit: void 0
+      limit: void 0,
+      fanout: () => {
+        throw new Error("Failed to set fanout model");
+      }
     };
     if (this.#type === "FI") {
       const updatedPattern = [0, ...branchPattern];
@@ -4996,6 +4999,7 @@ var PlannerFanIn = class {
           updatedPattern,
           planDebugger
         );
+        totalCost.fanout = cost.fanout;
         if (cost.returnedRows > maxrows) {
           maxrows = cost.returnedRows;
         }
@@ -5030,6 +5034,7 @@ var PlannerFanIn = class {
           updatedPattern,
           planDebugger
         );
+        totalCost.fanout = cost.fanout;
         totalCost.returnedRows += cost.returnedRows;
         totalCost.cost += cost.cost;
         totalCost.scanEst += cost.scanEst;
@@ -5277,7 +5282,7 @@ var PlannerConnection = class {
       this.#baseConstraints,
       constraint
     );
-    const { startupCost, rows } = this.#model(
+    const { startupCost, fanout, rows } = this.#model(
       this.table,
       this.#sort,
       this.#filters,
@@ -5289,7 +5294,8 @@ var PlannerConnection = class {
       cost: 0,
       returnedRows: rows,
       selectivity: this.selectivity,
-      limit: this.limit
+      limit: this.limit,
+      fanout
     };
     this.#cachedConstraintCosts.set(key, cost);
     planDebugger?.log({
@@ -5545,9 +5551,13 @@ var PlannerGraph = class {
       const join = this.joins[i];
       const targetState = state.joins[i];
       join.reset();
-      if (targetState.type === "flipped") {
+      if (targetState.type === "flipped" && join.type !== "flipped") {
         join.flip();
       }
+      assert(
+        targetState.type === join.type,
+        "join is not in the correct state after reset"
+      );
     }
   }
   /**
@@ -5589,15 +5599,11 @@ var PlannerGraph = class {
       );
     }
     const fofiCache = buildFOFICache(this);
-    const numPatterns = 2 ** flippableJoins.length;
+    const numPatterns = flippableJoins.length === 0 ? 0 : 2 ** flippableJoins.length;
     let bestCost = Infinity;
     let bestPlan = void 0;
     let bestAttemptNumber = -1;
-    const forcePattern = void 0;
     for (let pattern = 0; pattern < numPatterns; pattern++) {
-      if (forcePattern !== void 0 && pattern !== forcePattern) {
-        continue;
-      }
       this.resetPlanningState();
       if (planDebugger) {
         planDebugger.log({
@@ -5606,59 +5612,47 @@ var PlannerGraph = class {
           totalAttempts: numPatterns
         });
       }
-      try {
-        for (let i = 0; i < flippableJoins.length; i++) {
-          if (pattern & 1 << i) {
-            flippableJoins[i].flip();
-          }
-        }
-        checkAndConvertFOFI(fofiCache);
-        propagateUnlimitForFlippedJoins(this);
-        this.propagateConstraints(planDebugger);
-        if (planDebugger) {
-          planDebugger.log({
-            type: "constraints-propagated",
-            attemptNumber: pattern,
-            connectionConstraints: this.connections.map((c) => ({
-              connection: c.name,
-              constraints: c.getConstraintsForDebug(),
-              constraintCosts: c.getConstraintCostsForDebug()
-            }))
-          });
-        }
-        const totalCost = this.getTotalCost(planDebugger);
-        if (planDebugger) {
-          planDebugger.log({
-            type: "plan-complete",
-            attemptNumber: pattern,
-            totalCost,
-            flipPattern: pattern,
-            // Bitmask of which joins are flipped
-            // TODO: we'll need a different way to collect these
-            // nodeCosts: this.#collectNodeCosts(),
-            joinStates: this.joins.map((j) => {
-              const info = j.getDebugInfo();
-              return {
-                join: info.name,
-                type: info.type
-              };
-            })
-          });
-        }
-        if (totalCost < bestCost) {
-          bestCost = totalCost;
-          bestPlan = this.capturePlanningSnapshot();
-          bestAttemptNumber = pattern;
-        }
-      } catch (e) {
-        if (planDebugger) {
-          planDebugger.log({
-            type: "plan-failed",
-            attemptNumber: pattern,
-            reason: `Flip pattern ${pattern.toString(2)} failed: ${e instanceof Error ? e.message : String(e)}`
-          });
+      for (let i = 0; i < flippableJoins.length; i++) {
+        if (pattern & 1 << i) {
+          flippableJoins[i].flip();
         }
-        continue;
+      }
+      checkAndConvertFOFI(fofiCache);
+      propagateUnlimitForFlippedJoins(this);
+      this.propagateConstraints(planDebugger);
+      if (planDebugger) {
+        planDebugger.log({
+          type: "constraints-propagated",
+          attemptNumber: pattern,
+          connectionConstraints: this.connections.map((c) => ({
+            connection: c.name,
+            constraints: c.getConstraintsForDebug(),
+            constraintCosts: c.getConstraintCostsForDebug()
+          }))
+        });
+      }
+      const totalCost = this.getTotalCost(planDebugger);
+      if (planDebugger) {
+        planDebugger.log({
+          type: "plan-complete",
+          attemptNumber: pattern,
+          totalCost,
+          flipPattern: pattern,
+          // Bitmask of which joins are flipped
+          planSnapshot: this.capturePlanningSnapshot(),
+          joinStates: this.joins.map((j) => {
+            const info = j.getDebugInfo();
+            return {
+              join: info.name,
+              type: info.type
+            };
+          })
+        });
+      }
+      if (totalCost < bestCost) {
+        bestCost = totalCost;
+        bestPlan = this.capturePlanningSnapshot();
+        bestAttemptNumber = pattern;
       }
     }
     if (bestPlan) {
@@ -5678,8 +5672,9 @@ var PlannerGraph = class {
         });
       }
     } else {
-      throw new Error(
-        "No valid query plan found. This should not happen - check query structure."
+      assert(
+        numPatterns === 0,
+        "no plan was found but flippable joins did exist!"
       );
     }
   }
@@ -5826,18 +5821,16 @@ var PlannerJoin = class {
    */
   propagateUnlimit() {
     assert(this.#type === "flipped", "Can only unlimit a flipped join");
-    this.#parent.propagateUnlimitFromFlippedJoin();
     this.#child.propagateUnlimitFromFlippedJoin();
   }
   /**
    * Called when a parent join is flipped and this join is part of its child subgraph.
-   * - Semi-join: continue propagation to parent (the outer loop)
-   * - Flipped join: stop propagation (already unlimited when it was flipped)
+   * Continue propagation to parent (the outer loop).
+   * If we are hitting a semi-join, the parent drives.
+   * If we are hitting a flip-join, well now we have to unlimit its parent too!
    */
   propagateUnlimitFromFlippedJoin() {
-    if (this.#type === "semi") {
-      this.#parent.propagateUnlimitFromFlippedJoin();
-    }
+    this.#parent.propagateUnlimitFromFlippedJoin();
   }
   propagateConstraints(branchPattern, constraint, from, planDebugger) {
     planDebugger?.log({
@@ -5886,10 +5879,12 @@ var PlannerJoin = class {
   }
   estimateCost(downstreamChildSelectivity, branchPattern, planDebugger) {
     const child = this.#child.estimateCost(1, branchPattern, planDebugger);
+    const fanoutFactor = child.fanout(Object.keys(this.#childConstraint));
+    const scaledChildSelectivity = 1 - Math.pow(1 - child.selectivity, fanoutFactor.fanout);
     const parent = this.#parent.estimateCost(
       // Selectivity flows up the graph from child to parent
       // so we can determine the total selectivity of all ANDed exists checks.
-      child.selectivity * downstreamChildSelectivity,
+      this.#type === "flipped" ? 1 * downstreamChildSelectivity : scaledChildSelectivity * downstreamChildSelectivity,
       branchPattern,
       planDebugger
     );
@@ -5899,24 +5894,26 @@ var PlannerJoin = class {
         startupCost: parent.startupCost,
         scanEst: parent.limit === void 0 ? parent.returnedRows : Math.min(
           parent.returnedRows,
-          parent.limit / downstreamChildSelectivity
+          downstreamChildSelectivity === 0 ? 0 : parent.limit / downstreamChildSelectivity
         ),
         cost: parent.cost + parent.scanEst * (child.startupCost + child.cost + child.scanEst),
         returnedRows: parent.returnedRows * child.selectivity,
         selectivity: child.selectivity * parent.selectivity,
-        limit: parent.limit
+        limit: parent.limit,
+        fanout: parent.fanout
       };
     } else {
       costEstimate = {
         startupCost: child.startupCost,
         scanEst: parent.limit === void 0 ? parent.returnedRows * child.returnedRows : Math.min(
           parent.returnedRows * child.returnedRows,
-          parent.limit / downstreamChildSelectivity
+          downstreamChildSelectivity === 0 ? 0 : parent.limit / downstreamChildSelectivity
         ),
         cost: child.cost + child.scanEst * (parent.startupCost + parent.cost + parent.scanEst),
         returnedRows: parent.returnedRows * child.returnedRows * child.selectivity,
         selectivity: parent.selectivity * child.selectivity,
-        limit: parent.limit
+        limit: parent.limit,
+        fanout: parent.fanout
       };
     }
     planDebugger?.log({
@@ -8096,7 +8093,7 @@ var VersionNotSupported2 = "VersionNotSupported";
 var SchemaVersionNotSupported2 = "SchemaVersionNotSupported";
 
 // ../zero-client/src/client/zero.ts
-import "@rocicorp/logger";
+import { LogContext as LogContext3 } from "@rocicorp/logger";
 import { resolver as resolver11 } from "@rocicorp/resolver";
 
 // ../replicache/src/replicache-impl.ts
@@ -12871,8 +12868,8 @@ var NativeClientLockManager = class {
     this.#locks = locks;
     this.#signal = signal;
   }
-  request(name, mode, fn) {
-    return this.#locks.request(name, { mode, signal: this.#signal }, fn);
+  async request(name, mode, fn) {
+    await this.#locks.request(name, { mode, signal: this.#signal }, fn);
   }
   release(_name, fn) {
     fn();
@@ -15343,7 +15340,7 @@ function makeMessage(message, context, logLevel) {
 }
 
 // ../zero-client/src/client/version.ts
-var version2 = "0.25.0-canary.6";
+var version2 = "0.25.0-canary.7";
 
 // ../zero-client/src/client/log-options.ts
 var LevelFilterLogSink = class {
@@ -16678,10 +16675,6 @@ function getServer(server) {
   return validateServerParam("server", server);
 }
 
-// ../zero-client/src/client/zero-log-context.ts
-import { LogContext as LogContext3 } from "@rocicorp/logger";
-var ZeroLogContext = LogContext3;
-
 // ../zero-client/src/client/zero-poke-handler.ts
 import { Lock as Lock3 } from "@rocicorp/lock";
 var PokeHandler = class {
@@ -17266,7 +17259,7 @@ var Zero = class _Zero {
     }
     const { onError } = options;
     const sink = logOptions.logSink;
-    const lc = new ZeroLogContext(logOptions.logLevel, {}, sink);
+    const lc = new LogContext3(logOptions.logLevel, {}, sink);
     this.#onError = onError ? (error) => {
       void onError(error);
     } : (error) => {
@@ -18854,4 +18847,4 @@ export {
   update_needed_reason_type_enum_exports,
   Zero
 };
-//# sourceMappingURL=chunk-WWNKZSEE.js.map
+//# sourceMappingURL=chunk-FODUNUAD.js.map