@synnaxlabs/client 0.57.1 → 0.57.2

package/src/ranger/client.ts

@@ -340,16 +340,13 @@ const watchRelationships = <Q extends query.Params>(
     affectedRangeKeys(relOfEvent(event)),
   );
 
-const rangesWithLabel = (
-  relationships: query.Table<string, ontology.Relationship>,
-  key: label.Key,
-): Key[] | null => {
-  const keys = relationships
-    .get(
+const rangesWithLabel = (cache: ontology.Cache, key: label.Key): Key[] | null => {
+  const keys = cache
+    .relationshipsTo(label.ontologyID(key))
+    .filter(
       (r) =>
         r.type === label.LABELED_BY_ONTOLOGY_RELATIONSHIP_TYPE &&
-        r.from.type === "range" &&
-        r.to.key === key,
+        r.from.type === "range",
     )
     .map((r) => r.from.key);
   return keys.length === 0 ? null : keys;
@@ -358,10 +355,10 @@ const rangesWithLabel = (
 /** Projects label content changes onto the ranges they label. */
 const watchLabels = <Q extends query.Params>(
   labels: query.Table<label.Key, label.Label>,
-  relationships: query.Table<string, ontology.Relationship>,
+  cache: ontology.Cache,
 ): query.Watch<Q, Key> =>
   query.watch<Q, Key, label.Key, label.Label>(labels, (event) =>
-    rangesWithLabel(relationships, event.key),
+    rangesWithLabel(cache, event.key),
   );
 
 /** Config for {@link Client}. */
@@ -422,7 +419,9 @@ export class Client extends query.Retriever<
         query.deriveWatch(relationships, (event) =>
           affectedRangeKeys(relOfEvent(event)),
         ),
-        query.deriveWatch(labels, (event) => rangesWithLabel(relationships, event.key)),
+        query.deriveWatch(labels, (event) =>
+          rangesWithLabel(ontologyClient.cache, event.key),
+        ),
       ],
     });
     const single = cache.queries<Key | Name, Range, Key, Range>({
@@ -443,7 +442,7 @@ export class Client extends query.Retriever<
         matches: (r, query) => this.requestMatches(r, query),
         watch: [
           watchRelationships<RetrieveRequest>(relationships),
-          watchLabels<RetrieveRequest>(labels, relationships),
+          watchLabels<RetrieveRequest>(labels, ontologyClient.cache),
         ],
       },
       compose: (r) => this.composeOne(r),
@@ -597,7 +596,7 @@ export class Client extends query.Retriever<
   private composeOne(cached: Range): Range {
     const id = ontologyID(cached.key);
     const labels = label.cachedLabelsOf(
-      this.cfg.ontology.cache.relationships,
+      this.cfg.ontology.cache,
       this.cfg.labels.store,
       id,
     );
@@ -642,6 +641,17 @@ export class Client extends query.Retriever<
     }
   }
 
+  /** Writes a fetch response as one batch per table, so each table flushes once. */
+  private writeThroughMany(ranges: Range[]): void {
+    this.store.batch(() =>
+      this.cfg.labels.store.batch(() =>
+        this.cfg.ontology.cache.relationships.batch(() =>
+          ranges.forEach((r) => this.writeThrough(r)),
+        ),
+      ),
+    );
+  }
+
   /**
    * Fetches the given keys with labels and parents included, writing them and
    * their relationships through. Powers the table's fetch primitive.
@@ -652,7 +662,7 @@ export class Client extends query.Retriever<
       keys,
       ignoreNotFoundError: true,
     });
-    ranges.forEach((r) => this.writeThrough(r));
+    this.writeThroughMany(ranges);
     return ranges;
   }
 
@@ -686,7 +696,7 @@ export class Client extends query.Retriever<
   private async fetchRequest(query: RetrieveRequest): Promise<Range[]> {
     if (isKeysOnly(query)) return await this.store.retrieve(query.keys);
     const ranges = await this.execRetrieve({ ...BASE_REQUEST, ...query });
-    ranges.forEach((r) => this.writeThrough(r));
+    this.writeThroughMany(ranges);
     return ranges;
   }
 
@@ -701,7 +711,7 @@ export class Client extends query.Retriever<
       return false;
     if (primitive.isNonZero(req.hasLabels)) {
       const labels = label.cachedLabelsOf(
-        this.cfg.ontology.cache.relationships,
+        this.cfg.ontology.cache,
         this.cfg.labels.store,
         ontologyID(r.key),
       );

package/src/status/client.ts

@@ -99,7 +99,7 @@ export class Client extends query.Retriever<
           value: (changed, prev) => {
             const next = { ...prev, ...changed };
             const id = ontologyID(changed.key);
-            next.labels = label.cachedLabelsOf(relationships, labels.store, id);
+            next.labels = label.cachedLabelsOf(ontologyClient.cache, labels.store, id);
             return next;
           },
         }),
@@ -278,7 +278,7 @@ export class Client extends query.Retriever<
   /** Rebuilds a cached status with its cached labels attached. */
   private compose(cached: Status): Status {
     const labels = label.cachedLabelsOf(
-      this.cfg.ontology.cache.relationships,
+      this.cfg.ontology.cache,
       this.cfg.labels.store,
       ontologyID(cached.key),
     );
@@ -307,7 +307,14 @@ export class Client extends query.Retriever<
   /** Fetches statuses and writes their included labels through the caches. */
   private async fetchThrough(req: RetrieveRequest): Promise<Status[]> {
     const statuses = await this.execRetrieve({ ...BASE_REQUEST, ...req });
-    statuses.forEach((s) => this.writeThrough(s));
+    // One batch per table, so each table flushes once for the whole response.
+    this.store.batch(() =>
+      this.cfg.labels.store.batch(() =>
+        this.cfg.ontology.cache.relationships.batch(() =>
+          statuses.forEach((s) => this.writeThrough(s)),
+        ),
+      ),
+    );
     return statuses;
   }
 
@@ -362,13 +369,12 @@ export class Client extends query.Retriever<
 
   /** Returns the keys of cached statuses labeled by the given label. */
   private statusesLabeledBy(labelKey: label.Key): Key[] {
-    return this.cfg.ontology.cache.relationships
-      .get(
+    return this.cfg.ontology.cache
+      .relationshipsTo(label.ontologyID(labelKey))
+      .filter(
         (r) =>
           r.type === label.LABELED_BY_ONTOLOGY_RELATIONSHIP_TYPE &&
-          r.from.type === "status" &&
-          r.to.type === "label" &&
-          r.to.key === labelKey,
+          r.from.type === "status",
       )
       .map((r) => r.from.key);
   }