perf: improve incemental computation

garden-co · Dec 14, 2024 · f5a3394 · f5a3394
1 parent 4a52092
commit f5a3394
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/packages/cojson/src/coValueCore.ts b/packages/cojson/src/coValueCore.ts
@@ -618,14 +618,14 @@ export class CoValueCore {
 
   getValidTransactions(options?: {
     ignorePrivateTransactions: boolean;
-    exclude?: Set<`${SessionID}-${number}`>;
+    knownTransactions?: CoValueKnownState["sessions"];
   }): DecryptedTransaction[] {
     const validTransactions = determineValidTransactions(this);
 
     const allTransactions: DecryptedTransaction[] = [];
 
     for (const { txID, tx } of validTransactions) {
-      if (options?.exclude?.has(`${txID.sessionID}-${txID.txIndex}`)) {
+      if (options?.knownTransactions?.[txID.sessionID]! >= txID.txIndex) {
         continue;
       }
 

diff --git a/packages/cojson/src/coValues/coMap.ts b/packages/cojson/src/coValues/coMap.ts
@@ -1,7 +1,8 @@
 import { CoID, RawCoValue } from "../coValue.js";
-import { CoValueCore, DecryptedTransaction } from "../coValueCore.js";
-import { AgentID, SessionID, TransactionID } from "../ids.js";
+import { CoValueCore } from "../coValueCore.js";
+import { AgentID, TransactionID } from "../ids.js";
 import { JsonObject, JsonValue } from "../jsonValue.js";
+import { CoValueKnownState } from "../sync.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { isCoValue } from "../typeUtils/isCoValue.js";
 import { RawAccountID } from "./account.js";
@@ -50,7 +51,7 @@ export class RawCoMapView<
     [Key in keyof Shape & string]?: MapOp<Key, Shape[Key]>[];
   };
   /** @internal */
-  processedTransactionsSet: Set<`${SessionID}-${number}`>;
+  knownTransactions: CoValueKnownState["sessions"];
 
   /** @internal */
   ignorePrivateTransactions: boolean;
@@ -73,15 +74,15 @@ export class RawCoMapView<
       options?.ignorePrivateTransactions ?? false;
     this.ops = {};
     this.latest = {};
-    this.processedTransactionsSet = new Set();
+    this.knownTransactions = {};
 
     this.processLatestTransactions();
   }
 
   private getNextValidTransactions() {
     const nextValidTransactions = this.core.getValidTransactions({
       ignorePrivateTransactions: this.ignorePrivateTransactions,
-      exclude: this.processedTransactionsSet,
+      knownTransactions: this.knownTransactions,
     });
 
     return nextValidTransactions;
@@ -125,7 +126,10 @@ export class RawCoMapView<
           entries.push(entry);
           changedEntries.set(change.key, entries);
         }
-        this.processedTransactionsSet.add(`${txID.sessionID}-${txID.txIndex}`);
+        this.knownTransactions[txID.sessionID] = Math.max(
+          this.knownTransactions[txID.sessionID] ?? 0,
+          txID.txIndex,
+        );
       }
     }
 

diff --git a/packages/cojson/src/coValues/coStream.ts b/packages/cojson/src/coValues/coStream.ts
@@ -3,6 +3,7 @@ import { CoID, RawCoValue } from "../coValue.js";
 import { CoValueCore } from "../coValueCore.js";
 import { AgentID, SessionID, TransactionID } from "../ids.js";
 import { JsonObject, JsonValue } from "../jsonValue.js";
+import { CoValueKnownState } from "../sync.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { isAccountID } from "../typeUtils/isAccountID.js";
 import { isCoValue } from "../typeUtils/isCoValue.js";
@@ -53,14 +54,14 @@ export class RawCoStreamView<
     [key: SessionID]: CoStreamItem<Item>[];
   };
   /** @internal */
-  processedTransactionsSet: Set<`${SessionID}-${number}`>;
+  knownTransactions: CoValueKnownState["sessions"];
   readonly _item!: Item;
 
   constructor(core: CoValueCore) {
     this.id = core.id as CoID<this>;
     this.core = core;
     this.items = {};
-    this.processedTransactionsSet = new Set();
+    this.knownTransactions = {};
     this.fillFromCoValue();
   }
 
@@ -83,7 +84,7 @@ export class RawCoStreamView<
 
     for (const { txID, madeAt, changes } of this.core.getValidTransactions({
       ignorePrivateTransactions: false,
-      exclude: this.processedTransactionsSet,
+      knownTransactions: this.knownTransactions,
     })) {
       for (const changeUntyped of changes) {
         const change = changeUntyped as Item;
@@ -95,7 +96,10 @@ export class RawCoStreamView<
         entries.push({ value: change, madeAt, tx: txID });
         changeEntries.add(entries);
       }
-      this.processedTransactionsSet.add(`${txID.sessionID}-${txID.txIndex}`);
+      this.knownTransactions[txID.sessionID] = Math.max(
+        this.knownTransactions[txID.sessionID] ?? 0,
+        txID.txIndex,
+      );
     }
 
     for (const entries of changeEntries) {