@rocicorp/zero 0.25.10-canary.11 → 0.25.10-canary.13

package/out/zero-cache/src/services/view-syncer/view-syncer.js

@@ -39,6 +39,7 @@ import "../../db/specs.js";
 import { ResetPipelinesSignal } from "./snapshotter.js";
 import { versionString, cmpVersions, EMPTY_CVR_VERSION, versionToCookie, versionFromString } from "./schema/types.js";
 import { ttlClockFromNumber, ttlClockAsNumber } from "./ttl-clock.js";
+import { isPriorityOpRunning, noPriorityOpRunningPromise } from "../../server/priority-op.js";
 const tracer = trace.getTracer("view-syncer", version);
 const PROTOCOL_VERSION_ATTR = "protocol.version";
 const DEFAULT_KEEPALIVE_MS = 5e3;
@@ -155,7 +156,8 @@ class ViewSyncerService {
   );
   #inspectorDelegate;
   #config;
-  constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, inspectorDelegate, customQueryTransformer, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
+  #runPriorityOp;
+  constructor(config, lc, shard, taskID, clientGroupID, cvrDb, upstreamDb, pipelineDriver, versionChanges, drainCoordinator, slowHydrateThreshold, inspectorDelegate, customQueryTransformer, runPriorityOp, keepaliveMs = DEFAULT_KEEPALIVE_MS, setTimeoutFn = setTimeout.bind(globalThis)) {
     const queryConfig = config.query?.url ? config.query : config.getQueries;
     this.#config = config;
     this.id = clientGroupID;
@@ -181,6 +183,15 @@ class ViewSyncerService {
       () => this.#stateChanges.cancel()
     );
     this.#setTimeout = setTimeoutFn;
+    this.#runPriorityOp = async (lc2, description, op) => {
+      const start = Date.now();
+      lc2.debug?.(`running priority op ${description}`);
+      const result = await runPriorityOp(op);
+      lc2.debug?.(
+        `finished priority op ${description} after ${Date.now() - start} ms`
+      );
+      return result;
+    };
     this.keepalive();
   }
   #getHeaderOptions(forwardCookie) {
@@ -212,8 +223,12 @@ class ViewSyncerService {
         return;
       }
       if (!this.#cvr) {
-        this.#lc.debug?.("loading CVR");
-        this.#cvr = await this.#cvrStore.load(lc, this.#lastConnectTime);
+        this.#lc.debug?.("loading cvr");
+        this.#cvr = await this.#runPriorityOp(
+          lc,
+          "loading cvr",
+          () => this.#cvrStore.load(lc, this.#lastConnectTime)
+        );
         this.#ttlClock = this.#cvr.ttlClock;
         this.#ttlClockBase = Date.now();
       } else {
@@ -488,19 +503,21 @@ class ViewSyncerService {
     this.#ttlClockBase = now;
     return ttlClock;
   }
-  async #flushUpdater(lc, updater) {
-    const now = Date.now();
-    const ttlClock = this.#getTTLClock(now);
-    const { cvr, flushed } = await updater.flush(
-      lc,
-      this.#lastConnectTime,
-      now,
-      ttlClock
-    );
-    if (flushed) {
-      this.#startTTLClockInterval(lc);
-    }
-    return cvr;
+  #flushUpdater(lc, updater) {
+    return this.#runPriorityOp(lc, "flushing cvr", async () => {
+      const now = Date.now();
+      const ttlClock = this.#getTTLClock(now);
+      const { cvr, flushed } = await updater.flush(
+        lc,
+        this.#lastConnectTime,
+        now,
+        ttlClock
+      );
+      if (flushed) {
+        this.#startTTLClockInterval(lc);
+      }
+      return cvr;
+    });
   }
   #startTTLClockInterval(lc) {
     this.#stopTTLClockInterval();
@@ -757,19 +774,26 @@ class ViewSyncerService {
         "Custom/named queries were requested but no `ZERO_QUERY_URL` is configured for Zero Cache."
       );
     }
-    if (this.#customQueryTransformer && customQueries.size > 0) {
-      const transformedCustomQueries = await this.#customQueryTransformer.transform(
-        this.#getHeaderOptions(this.#queryConfig.forwardCookies),
-        customQueries.values(),
-        this.userQueryURL
-      );
-      this.#processTransformedCustomQueries(
-        lc,
-        transformedCustomQueries,
-        (q) => transformedQueries.push(q),
-        customQueries
-      );
-    }
+    await this.#runPriorityOp(lc, "hydrating unchanged queries", async () => {
+      const customQueryTransformer = this.#customQueryTransformer;
+      if (customQueryTransformer && customQueries.size > 0) {
+        const transformedCustomQueries = await this.#runPriorityOp(
+          lc,
+          "#hydrateUnchangedQueries transforming custom queries",
+          () => customQueryTransformer.transform(
+            this.#getHeaderOptions(this.#queryConfig.forwardCookies),
+            customQueries.values(),
+            this.userQueryURL
+          )
+        );
+        this.#processTransformedCustomQueries(
+          lc,
+          transformedCustomQueries,
+          (q) => transformedQueries.push(q),
+          customQueries
+        );
+      }
+    });
     for (const q of otherQueries) {
       const transformed = transformAndHashQuery(
         lc,
@@ -790,7 +814,7 @@ class ViewSyncerService {
       transformationHash,
       transformedAst
     } of transformedQueries) {
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       let count = 0;
       await startAsyncSpan(
         tracer,
@@ -936,14 +960,19 @@ class ViewSyncerService {
         );
       }
       let erroredQueryIDs;
-      if (this.#customQueryTransformer && customQueries.size > 0) {
+      const customQueryTransformer = this.#customQueryTransformer;
+      if (customQueryTransformer && customQueries.size > 0) {
         const transformStart = performance.now();
         let transformedCustomQueries;
         try {
-          transformedCustomQueries = await this.#customQueryTransformer.transform(
-            this.#getHeaderOptions(true),
-            customQueries.values(),
-            this.userQueryURL
+          transformedCustomQueries = await this.#runPriorityOp(
+            lc,
+            "#syncQueryPipelineSet transforming custom queries",
+            () => customQueryTransformer.transform(
+              this.#getHeaderOptions(true),
+              customQueries.values(),
+              this.userQueryURL
+            )
           );
           this.#queryTransformations.add(1, { result: "success" });
         } catch (e) {
@@ -1133,12 +1162,12 @@ class ViewSyncerService {
         }
       }
       let totalProcessTime = 0;
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       const pipelines = this.#pipelines;
       const hydrations = this.#hydrations;
       const hydrationTime = this.#hydrationTime;
       const self = this;
-      await yieldProcess();
+      await yieldProcess(lc);
       function* generateRowChanges(slowHydrateThreshold) {
         for (const q of addQueries) {
           lc = lc.withContext("hash", q.id).withContext("transformationHash", q.transformationHash);
@@ -1359,7 +1388,7 @@ class ViewSyncerService {
         "pipelines must be initialized (advancePipelines"
       );
       const start = performance.now();
-      const timer = new TimeSliceTimer();
+      const timer = new TimeSliceTimer(lc);
       const { version: version2, numChanges, changes } = this.#pipelines.advance(timer);
       lc = lc.withContext("newVersion", version2);
       const updater = new CVRQueryDrivenUpdater(
@@ -1464,8 +1493,23 @@ function createHashToIDs(cvr) {
   return hashToIDs;
 }
 const timeSliceQueue = new Lock();
-function yieldProcess() {
-  return timeSliceQueue.withLock(() => new Promise(setImmediate));
+async function yieldProcess(lc) {
+  async function wait() {
+    if (isPriorityOpRunning()) {
+      const start = Date.now();
+      lc.debug?.("yieldProcess waiting for priority op");
+      await noPriorityOpRunningPromise();
+      lc.debug?.(
+        `yieldProcess waited for priority op ${Date.now() - start} ms`
+      );
+    }
+    await new Promise(setImmediate);
+    if (isPriorityOpRunning()) {
+      lc.debug?.("yieldProcess recursing because priority op is running");
+      await wait();
+    }
+  }
+  await timeSliceQueue.withLock(wait);
 }
 function contentsAndVersion(row) {
   const { [ZERO_VERSION_COLUMN_NAME]: version2, ...contents } = row;
@@ -1552,8 +1596,12 @@ function hasExpiredQueries(cvr) {
 class TimeSliceTimer {
   #total = 0;
   #start = 0;
+  #lc;
+  constructor(lc) {
+    this.#lc = lc;
+  }
   async start() {
-    await yieldProcess();
+    await yieldProcess(this.#lc);
     return this.startWithoutYielding();
   }
   startWithoutYielding() {
@@ -1563,7 +1611,7 @@ class TimeSliceTimer {
   }
   async yieldProcess(_msgForTesting) {
     this.#stopLap();
-    await yieldProcess();
+    await yieldProcess(this.#lc);
     this.#startLap();
   }
   #startLap() {