@rocicorp/zero 0.2.2024101101 → 0.3.2024102500

package/out/zero-cache/src/services/replicator/schema/change-log.js

@@ -14,21 +14,41 @@ import { normalizedKeyOrder } from '../../../types/row-key.js';
  * new contents. (In the common case, the new contents will have just been applied
  * and thus has a high likelihood of being in the SQLite cache.)
  *
- * The postgres TRUNCATE operation is represented as a log entry with a `null` row
- * key, which means that it is sorted before any row operations for that table.
+ * There are two table-wide operations:
+ * - `t` corresponds to the postgres `TRUNCATE` operation
+ * - `r` represents any schema (i.e. column) change
+ *
+ * For both operations, the corresponding row changes are not explicitly included
+ * in the change log. The consumer has the option of simulating them be reading
+ * from pre- and post- snapshots, or resetting their state entirely with the current
+ * snapshot.
+ *
+ * To achieve the desired ordering semantics when processing tables that have been
+ * truncated, reset, and modified, the "rowKey" is set to `null` for resets and
+ * the empty string `""` for truncates. This means that resets will be encountered
+ * before truncates, which will be processed before any subsequent row changes.
+ *
+ * This ordering is chosen because resets are currently the more "destructive" op
+ * and result in aborting the processing (and starting from scratch); doing this
+ * earlier reduces wasted work.
  */
 export const SET_OP = 's';
 export const DEL_OP = 'd';
 export const TRUNCATE_OP = 't';
+export const RESET_OP = 'r';
 const CREATE_CHANGELOG_SCHEMA = 
 // stateVersion : a.k.a. row version
 // table        : The table associated with the change
 // rowKey       : JSON row key for a row change, or NULL for a table TRUNCATE.
-//                Note that SQLite will sort rows such that TRUNCATE operations appear
-//                before row operations (as desired), as NULL appears before non-NULL values.
-// op           : 't' for table truncation, 's' for set (insert/update), and 'd' for delete
+//                Note that SQLite will sort rows such that TRUNCATE and RESET operations
+//                appear before row operations (as desired), as NULL appears before non-NULL
+//                 values.
+// op           : 't' for table truncation
+//              : 'r' for table reset (schema change)
+//                's' for set (insert/update)
+//                'd' for delete
 `
-  CREATE TABLE "_zero.ChangeLog" (
+  CREATE TABLE "_zero.changeLog" (
     "stateVersion" TEXT NOT NULL,
     "table"        TEXT NOT NULL,
     "rowKey"       TEXT,
@@ -42,10 +62,11 @@ export const changeLogEntrySchema = v
     stateVersion: v.string(),
     table: v.string(),
     rowKey: v.string().nullable(),
-    op: v.union(v.literal(SET_OP), v.literal(DEL_OP), v.literal(TRUNCATE_OP)),
+    op: v.union(v.literal(SET_OP), v.literal(DEL_OP), v.literal(TRUNCATE_OP), v.literal(RESET_OP)),
 })
     .map(val => ({
     ...val,
+    // Note: both `null` (for reset) and empty string "" (for truncate) will result in `null`
     rowKey: val.rowKey ? v.parse(parse(val.rowKey), jsonObjectSchema) : null,
 }));
 export function initChangeLog(db) {
@@ -60,19 +81,30 @@ export function logDeleteOp(db, version, table, row) {
 function logRowOp(db, version, table, row, op) {
     const rowKey = stringify(normalizedKeyOrder(row));
     db.run(`
-    INSERT INTO "_zero.ChangeLog" (stateVersion, "table", rowKey, op)
+    INSERT INTO "_zero.changeLog" (stateVersion, "table", rowKey, op)
       VALUES (@version, @table, JSON(@rowKey), @op)
       ON CONFLICT ("table", rowKey) DO UPDATE
       SET stateVersion = @version, op = @op
     `, { version, table, rowKey, op });
 }
 export function logTruncateOp(db, version, table) {
+    logTableWideOp(db, version, table, TRUNCATE_OP);
+}
+export function logResetOp(db, version, table) {
+    logTableWideOp(db, version, table, RESET_OP);
+}
+function logTableWideOp(db, version, table, op) {
+    db.run(
+    // Delete all row ops for the table (`rowKey > ''`),
+    // and any previous instance of the same (table-wide) op (`op = ?`).
+    `
+    DELETE FROM "_zero.changeLog" WHERE "table" = ? AND (rowKey > '' OR op = ?)
+    `, table, op);
     db.run(`
-    DELETE FROM "_zero.ChangeLog" WHERE "table" = ?
-    `, table);
-    db.run(`
-    INSERT INTO "_zero.ChangeLog" (stateVersion, "table", op) 
-      VALUES (@version, @table, @op)
-    `, { version, table, op: TRUNCATE_OP });
+    INSERT INTO "_zero.changeLog" (stateVersion, "table", rowKey, op) 
+      VALUES (@version, @table, @rowKey, @op)
+    `, 
+    // See file JSDoc for explanation of the rowKey w.r.t. ordering of table-wide ops.
+    { version, table, rowKey: op === RESET_OP ? null : '', op });
 }
 //# sourceMappingURL=change-log.js.map

package/out/zero-cache/src/services/replicator/schema/change-log.js.map

@@ -1 +1 @@
-{"version":3,"file":"change-log.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/change-log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,qCAAqC,CAAC;AAEzD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,gBAAgB,EAChB,KAAK,EACL,SAAS,GACV,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAC,kBAAkB,EAAC,MAAM,2BAA2B,CAAC;AAE7D;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAC;AAC1B,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAC;AAC1B,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,CAAC;AAE/B,MAAM,uBAAuB;AAC3B,oCAAoC;AACpC,sDAAsD;AACtD,8EAA8E;AAC9E,sFAAsF;AACtF,6FAA6F;AAC7F,2FAA2F;AAC3F;;;;;;;;;GASC,CAAC;AAEJ,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC;KAClC,MAAM,CAAC;IACN,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;CAC1E,CAAC;KACD,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACX,GAAG,GAAG;IACN,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;CACzE,CAAC,CAAC,CAAC;AAIN,MAAM,UAAU,aAAa,CAAC,EAAY;IACxC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,EAAmB,EACnB,OAAoB,EACpB,KAAa,EACb,GAAe;IAEf,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,WAAW,CACzB,EAAmB,EACnB,OAAoB,EACpB,KAAa,EACb,GAAe;IAEf,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,QAAQ,CACf,EAAmB,EACnB,OAAoB,EACpB,KAAa,EACb,GAAe,EACf,EAAU;IAEV,MAAM,MAAM,GAAG,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,EAAE,CAAC,GAAG,CACJ;;;;;KAKC,EACD,EAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAC,CAC7B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,EAAmB,EACnB,OAAoB,EACpB,KAAa;IAEb,EAAE,CAAC,GAAG,CACJ;;KAEC,EACD,KAAK,CACN,CAAC;IAEF,EAAE,CAAC,GAAG,CACJ;;;KAGC,EACD,EAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAC,CAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"change-log.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/change-log.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/replicator/schema/replication-state.d.ts

@@ -5,8 +5,8 @@
  * after the logical replication handoff when initial data synchronization has completed.
  */
 import * as v from '../../../../../shared/src/valita.js';
-import { StatementRunner } from '../../../db/statements.js';
 import { Database } from '../../../../../zqlite/src/db.js';
+import { StatementRunner } from '../../../db/statements.js';
 export declare const ZERO_VERSION_COLUMN_NAME = "_0_version";
 declare const versionsSchema: v.ObjectType<{
     stateVersion: v.Type<string>;

package/out/zero-cache/src/services/replicator/schema/replication-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replication-state.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/replication-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,CAAC,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AAEzD,eAAO,MAAM,wBAAwB,eAAe,CAAC;AA4CrD,QAAA,MAAM,cAAc;;;aAGlB,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEjE,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,QAAQ,EACZ,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,MAAM,QAelB;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,eAAe;;;;EAUvD;AAED,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,MAAM,QAelB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,eAAe,GAClB,mBAAmB,CAKrB"}
+{"version":3,"file":"replication-state.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/replication-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,CAAC,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,eAAO,MAAM,wBAAwB,eAAe,CAAC;AA4CrD,QAAA,MAAM,cAAc;;;aAGlB,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEjE,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,QAAQ,EACZ,YAAY,EAAE,MAAM,EAAE,EACtB,SAAS,EAAE,MAAM,QAelB;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,eAAe;;;;EAUvD;AAED,wBAAgB,0BAA0B,CACxC,EAAE,EAAE,eAAe,EACnB,SAAS,EAAE,MAAM,QAelB;AAED,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,eAAe,GAClB,mBAAmB,CAKrB"}

package/out/zero-cache/src/services/replicator/schema/replication-state.js

@@ -5,8 +5,8 @@
  * after the logical replication handoff when initial data synchronization has completed.
  */
 import * as v from '../../../../../shared/src/valita.js';
-import { StatementRunner } from '../../../db/statements.js';
 import { Database } from '../../../../../zqlite/src/db.js';
+import { StatementRunner } from '../../../db/statements.js';
 export const ZERO_VERSION_COLUMN_NAME = '_0_version';
 const CREATE_REPLICATION_STATE_SCHEMA = 
 // replicaVersion   : A value identifying the version at which the initial sync happened, i.e.
@@ -18,7 +18,7 @@ const CREATE_REPLICATION_STATE_SCHEMA =
 // publications     : JSON stringified array of publication names
 // lock             : Auto-magic column for enforcing single-row semantics.
 `
-  CREATE TABLE "_zero.ReplicationConfig" (
+  CREATE TABLE "_zero.replicationConfig" (
     replicaVersion TEXT NOT NULL,
     publications TEXT NOT NULL,
     lock INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
@@ -30,7 +30,7 @@ const CREATE_REPLICATION_STATE_SCHEMA =
     //                    modified in the **next** transaction.
     // stateVersion     : The value of the _0_version column for the newest rows in the database.
     `
-  CREATE TABLE "_zero.ReplicationState" (
+  CREATE TABLE "_zero.replicationState" (
     watermark TEXT NOT NULL,
     stateVersion TEXT NOT NULL,
     lock INTEGER PRIMARY KEY DEFAULT 1 CHECK (lock=1)
@@ -54,19 +54,19 @@ const versionsSchema = v.object({
 export function initReplicationState(db, publications, watermark) {
     db.exec(CREATE_REPLICATION_STATE_SCHEMA);
     db.prepare(`
-    INSERT INTO "_zero.ReplicationConfig" 
+    INSERT INTO "_zero.replicationConfig" 
        (replicaVersion, publications) VALUES (?, ?)
     `).run(watermark, JSON.stringify(publications.sort()));
     db.prepare(`
-    INSERT INTO "_zero.ReplicationState" 
+    INSERT INTO "_zero.replicationState" 
        (watermark, stateVersion) VALUES (?,'00')
     `).run(watermark);
 }
 export function getSubscriptionState(db) {
     const result = db.get(`
       SELECT c.replicaVersion, c.publications, s.watermark 
-        FROM "_zero.ReplicationConfig" as c
-        JOIN "_zero.ReplicationState" as s
+        FROM "_zero.replicationConfig" as c
+        JOIN "_zero.replicationState" as s
         ON c.lock = s.lock
     `);
     return v.parse(result, subscriptionStateSchema);
@@ -77,14 +77,14 @@ export function updateReplicationWatermark(db, watermark) {
     // UPSERT for which the INSERT fails so that the value of `watermark`
     // from the original row can be used to set the new `stateVersion`.
     db.run(`
-      INSERT INTO "_zero.ReplicationState" 
+      INSERT INTO "_zero.replicationState" 
         (lock, watermark, stateVersion) VALUES (1,'','')
         ON CONFLICT (lock)
         DO UPDATE SET watermark=?, stateVersion=watermark
     `, watermark);
 }
 export function getReplicationVersions(db) {
-    const result = db.get(`SELECT stateVersion, watermark as nextStateVersion FROM "_zero.ReplicationState"`);
+    const result = db.get(`SELECT stateVersion, watermark as nextStateVersion FROM "_zero.replicationState"`);
     return v.parse(result, versionsSchema);
 }
 //# sourceMappingURL=replication-state.js.map

package/out/zero-cache/src/services/replicator/schema/replication-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"replication-state.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/replication-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,CAAC,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AAEzD,MAAM,CAAC,MAAM,wBAAwB,GAAG,YAAY,CAAC;AAErD,MAAM,+BAA+B;AACnC,8FAA8F;AAC9F,iGAAiG;AACjG,iGAAiG;AACjG,4FAA4F;AAC5F,gGAAgG;AAChG,sEAAsE;AACtE,iEAAiE;AACjE,2EAA2E;AAC3E;;;;;;GAMC;IACD,oGAAoG;IACpG,wFAAwF;IACxF,8FAA8F;IAC9F,2DAA2D;IAC3D,6FAA6F;IAC7F;;;;;;GAMC,CAAC;AAEJ,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAExC,MAAM,uBAAuB,GAAG,CAAC;KAC9B,MAAM,CAAC;IACN,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;IAC1B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC;KACD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACT,GAAG,CAAC;IACJ,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC;CAC/D,CAAC,CAAC,CAAC;AAEN,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;CAC7B,CAAC,CAAC;AAIH,MAAM,UAAU,oBAAoB,CAClC,EAAY,EACZ,YAAsB,EACtB,SAAiB;IAEjB,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACzC,EAAE,CAAC,OAAO,CACR;;;KAGC,CACF,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,EAAE,CAAC,OAAO,CACR;;;KAGC,CACF,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EAAmB;IACtD,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CACnB;;;;;KAKC,CACF,CAAC;IACF,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,EAAmB,EACnB,SAAiB;IAEjB,uEAAuE;IACvE,8EAA8E;IAC9E,qEAAqE;IACrE,mEAAmE;IACnE,EAAE,CAAC,GAAG,CACJ;;;;;KAKC,EACD,SAAS,CACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAAmB;IAEnB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CACnB,kFAAkF,CACnF,CAAC;IACF,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"replication-state.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/replicator/schema/replication-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,CAAC,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAC,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,MAAM,CAAC,MAAM,wBAAwB,GAAG,YAAY,CAAC;AAErD,MAAM,+BAA+B;AACnC,8FAA8F;AAC9F,iGAAiG;AACjG,iGAAiG;AACjG,4FAA4F;AAC5F,gGAAgG;AAChG,sEAAsE;AACtE,iEAAiE;AACjE,2EAA2E;AAC3E;;;;;;GAMC;IACD,oGAAoG;IACpG,wFAAwF;IACxF,8FAA8F;IAC9F,2DAA2D;IAC3D,6FAA6F;IAC7F;;;;;;GAMC,CAAC;AAEJ,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;AAExC,MAAM,uBAAuB,GAAG,CAAC;KAC9B,MAAM,CAAC;IACN,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE;IAC1B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;CACtB,CAAC;KACD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACT,GAAG,CAAC;IACJ,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC;CAC/D,CAAC,CAAC,CAAC;AAEN,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE;IACxB,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE;CAC7B,CAAC,CAAC;AAIH,MAAM,UAAU,oBAAoB,CAClC,EAAY,EACZ,YAAsB,EACtB,SAAiB;IAEjB,EAAE,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACzC,EAAE,CAAC,OAAO,CACR;;;KAGC,CACF,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,EAAE,CAAC,OAAO,CACR;;;KAGC,CACF,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EAAmB;IACtD,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CACnB;;;;;KAKC,CACF,CAAC;IACF,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,EAAmB,EACnB,SAAiB;IAEjB,uEAAuE;IACvE,8EAA8E;IAC9E,qEAAqE;IACrE,mEAAmE;IACnE,EAAE,CAAC,GAAG,CACJ;;;;;KAKC,EACD,SAAS,CACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,EAAmB;IAEnB,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,CACnB,kFAAkF,CACnF,CAAC;IACF,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AACzC,CAAC"}

package/out/zero-cache/src/services/view-syncer/client-handler.d.ts

@@ -1,11 +1,11 @@
 import type { LogContext } from '@rocicorp/logger';
 import { type JSONObject as SafeJSONObject } from '../../../../shared/src/json.js';
+import type { AST } from '../../../../zero-protocol/src/ast.js';
 import type { Downstream } from '../../../../zero-protocol/src/mod.js';
-import type { AST } from '../../../../zql/src/zql/ast/ast.js';
 import type { JSONObject } from '../../types/bigint-json.js';
+import { type SchemaVersions } from '../../types/schema-versions.js';
 import type { Subscription } from '../../types/subscription.js';
 import { type ClientPatch, type CVRVersion, type DelQueryPatch, type NullableCVRVersion, type PutQueryPatch, type RowID } from './schema/types.js';
-import { type SchemaVersions } from '../../types/schema-versions.js';
 export type PutRowPatch = {
     type: 'row';
     op: 'put';
@@ -28,6 +28,7 @@ export type PatchToVersion = {
 };
 export interface PokeHandler {
     addPatch(patch: PatchToVersion): void;
+    cancel(): void;
     end(): void;
 }
 /**
@@ -37,7 +38,7 @@ export declare class ClientHandler {
     #private;
     readonly clientID: string;
     readonly wsID: string;
-    constructor(lc: LogContext, clientGroupID: string, clientID: string, wsID: string, baseCookie: string | null, schemaVersion: number, pokes: Subscription<Downstream>);
+    constructor(lc: LogContext, clientGroupID: string, clientID: string, wsID: string, shardID: string, baseCookie: string | null, schemaVersion: number, pokes: Subscription<Downstream>);
     version(): NullableCVRVersion;
     fail(e: unknown): void;
     close(): void;

package/out/zero-cache/src/services/view-syncer/client-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,UAAU,IAAI,cAAc,EAClC,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAC5D,OAAO,KAAK,EAAC,UAAU,EAAY,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,KAAK,EAGX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AAExC,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;IACV,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,cAAc,CAAC;AACpD,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,aAAa,GACb,CAAC,aAAa,GAAG;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,GAAG,IAAI,IAAI,CAAC;CACb;AAWD;;GAEG;AACH,qBAAa,aAAa;;IAExB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAOpB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC;IAWjC,OAAO,IAAI,kBAAkB;IAI7B,IAAI,CAAC,CAAC,EAAE,OAAO;IAIf,KAAK;IAIL,SAAS,CACP,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,cAAc,GAC7B,WAAW;CAqHf;AAwCD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAgB9D"}
+{"version":3,"file":"client-handler.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAEL,KAAK,UAAU,IAAI,cAAc,EAClC,MAAM,gCAAgC,CAAC;AAExC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,sCAAsC,CAAC;AAE9D,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,sCAAsC,CAAC;AAE9C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,gCAAgC,CAAC;AACxC,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EACL,KAAK,WAAW,EAGhB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAClB,KAAK,KAAK,EAGX,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;IACV,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,KAAK,CAAC;IACV,EAAE,EAAE,KAAK,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,cAAc,CAAC;AACpD,MAAM,MAAM,WAAW,GACnB,WAAW,GACX,aAAa,GACb,CAAC,aAAa,GAAG;IAAC,GAAG,EAAE,GAAG,CAAA;CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,QAAQ,CAAC;AAE3C,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,UAAU,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAAC;IACtC,MAAM,IAAI,IAAI,CAAC;IACf,GAAG,IAAI,IAAI,CAAC;CACb;AAYD;;GAEG;AACH,qBAAa,aAAa;;IAExB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAQpB,EAAE,EAAE,UAAU,EACd,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,IAAI,EACzB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC;IAYjC,OAAO,IAAI,kBAAkB;IAI7B,IAAI,CAAC,CAAC,EAAE,OAAO;IAIf,KAAK;IAIL,SAAS,CACP,YAAY,EAAE,UAAU,EACxB,cAAc,EAAE,cAAc,GAC7B,WAAW;CAyHf;AAmCD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,cAAc,CAgB9D"}

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

@@ -1,10 +1,14 @@
 import { unreachable } from '../../../../shared/src/asserts.js';
 import { assertJSONValue, } from '../../../../shared/src/json.js';
 import * as v from '../../../../shared/src/valita.js';
-import { cmpVersions, cookieToVersion, versionToCookie, versionToNullableCookie, } from './schema/types.js';
+import { rowSchema } from '../../../../zero-protocol/src/data.js';
+import { primaryKeyValueRecordSchema } from '../../../../zero-protocol/src/primary-key.js';
 import { getErrorForClientIfSchemaVersionNotSupported, } from '../../types/schema-versions.js';
+import { unescapedSchema as schema } from '../change-streamer/pg/schema/shard.js';
+import { cmpVersions, cookieToVersion, versionToCookie, versionToNullableCookie, } from './schema/types.js';
 const NOOP = {
     addPatch: () => { },
+    cancel: () => { },
     end: () => { },
 };
 // Semi-arbitrary threshold at which poke body parts are flushed.
@@ -17,14 +21,16 @@ export class ClientHandler {
     #clientGroupID;
     clientID;
     wsID;
+    #zeroClientsTable;
     #lc;
     #pokes;
     #baseVersion;
     #schemaVersion;
-    constructor(lc, clientGroupID, clientID, wsID, baseCookie, schemaVersion, pokes) {
+    constructor(lc, clientGroupID, clientID, wsID, shardID, baseCookie, schemaVersion, pokes) {
         this.#clientGroupID = clientGroupID;
         this.clientID = clientID;
         this.wsID = wsID;
+        this.#zeroClientsTable = `${schema(shardID)}.clients`;
         this.#lc = lc.withContext('clientID', clientID);
         this.#pokes = pokes;
         this.#baseVersion = cookieToVersion(baseCookie);
@@ -93,11 +99,11 @@ export class ClientHandler {
                     break;
                 }
                 case 'row':
-                    if (patch.id.table === 'zero.clients') {
+                    if (patch.id.table === this.#zeroClientsTable) {
                         this.#updateLMIDs((body.lastMutationIDChanges ??= {}), patch);
                     }
                     else {
-                        (body.entitiesPatch ??= []).push(makeEntityPatch(patch));
+                        (body.rowsPatch ??= []).push(makeRowPatch(patch));
                     }
                     break;
                 default:
@@ -116,6 +122,9 @@ export class ClientHandler {
                     this.#pokes.fail(e instanceof Error ? e : new Error(String(e)));
                 }
             },
+            cancel: () => {
+                this.#pokes.push(['pokeEnd', { pokeID, cancel: true }]);
+            },
             end: () => {
                 flushBody();
                 this.#pokes.push(['pokeEnd', { pokeID }]);
@@ -140,34 +149,31 @@ export class ClientHandler {
         }
     }
 }
-// Note: The zero.clients table is set up in replicator/initial-sync.ts.
+// Note: The zero_{SHARD_ID}.clients table is set up in replicator/initial-sync.ts.
 const lmidRowSchema = v.object({
     clientGroupID: v.string(),
     clientID: v.string(),
     lastMutationID: v.number(), // Actually returned as a bigint, but converted by ensureSafeJSON().
 });
-function makeEntityPatch(patch) {
-    const { op, id: { table: entityType, rowKey: entityID }, } = patch;
-    assertStringValues(entityID); // TODO: Enforce this ZQL constraint at sync time.
-    const entity = { entityType, entityID };
+function makeRowPatch(patch) {
+    const { op, id: { table: tableName, rowKey: id }, } = patch;
     switch (op) {
-        case 'put': {
-            const { contents } = patch;
-            return { ...entity, op: 'put', value: ensureSafeJSON(contents) };
-        }
+        case 'put':
+            return {
+                op: 'put',
+                tableName,
+                value: v.parse(ensureSafeJSON(patch.contents), rowSchema),
+            };
         case 'del':
-            return { ...entity, op };
+            return {
+                op,
+                tableName,
+                id: v.parse(id, primaryKeyValueRecordSchema),
+            };
         default:
             unreachable(op);
     }
 }
-function assertStringValues(rowKey) {
-    for (const value of Object.values(rowKey)) {
-        if (typeof value !== 'string') {
-            throw new Error(`invalid row key type ${typeof value}`);
-        }
-    }
-}
 /**
  * Column values of type INT8 are returned as the `bigint` from the
  * Postgres library. These are converted to `number` if they are within

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

@@ -1 +1 @@
-{"version":3,"file":"client-handler.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-handler.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/client-handler.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts

@@ -19,9 +19,7 @@ export declare class CVRStore {
     getRowRecords(): Promise<ReadonlyMap<RowID, RowRecord>>;
     getPendingRowRecord(id: RowID): RowRecord | undefined;
     putRowRecord(row: RowRecord): void;
-    putInstance(version: CVRVersion, lastActive: {
-        epochMillis: number;
-    }): void;
+    putInstance({ version, replicaVersion, lastActive, }: Pick<CVRSnapshot, 'version' | 'replicaVersion' | 'lastActive'>): void;
     markQueryAsDeleted(version: CVRVersion, queryPatch: QueryPatch): void;
     putQuery(query: QueryRecord): void;
     updateQuery(query: QueryRecord): void;
@@ -39,6 +37,10 @@ export declare class CVRStore {
     }): void;
     catchupRowPatches(lc: LogContext, afterVersion: NullableCVRVersion, upToCVR: CVRSnapshot, excludeQueryHashes?: string[]): AsyncGenerator<RowsRow[], void, undefined>;
     catchupConfigPatches(lc: LogContext, afterVersion: NullableCVRVersion, upToCVR: CVRSnapshot): Promise<PatchToVersion[]>;
-    flush(): Promise<CVRFlushStats>;
+    flush(expectedCurrentVersion: CVRVersion): Promise<CVRFlushStats>;
+}
+export declare class ConcurrentModificationException extends Error {
+    readonly name = "ConcurrentModificationException";
+    constructor(expectedVersion: string, actualVersion: string);
 }
 //# sourceMappingURL=cvr-store.d.ts.map

package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cvr-store.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAajD,OAAO,KAAK,EAAC,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AAEvE,OAAO,KAAK,EAAQ,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAC,GAAG,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAC/C,OAAO,EAML,KAAK,OAAO,EAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,UAAU,EAEf,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,KAAK,EACV,KAAK,SAAS,EAGf,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmFF,qBAAa,QAAQ;;gBAaP,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM;IAOnD,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC;IA6E1B,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAIvD,mBAAmB,CAAC,EAAE,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS;IAIrD,YAAY,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAIlC,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE;QAAC,WAAW,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI;IAezE,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAarE,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAqClC,WAAW,CAAC,KAAK,EAAE,WAAW;IA0B9B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,GAAG,IAAI;IAS1E,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAexC,kBAAkB,CAChB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACnB,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACpB,OAAO,EAAE,OAAO,GACf,IAAI;IAcP,eAAe,CACb,aAAa,EAAE,UAAU,EACzB,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACnB,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,GACnB,IAAI;IAYA,iBAAiB,CACtB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,EACpB,kBAAkB,GAAE,MAAM,EAAO,GAChC,cAAc,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC;IA8BvC,oBAAoB,CACxB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC;IA4DtB,KAAK,IAAI,OAAO,CAAC,aAAa,CAAC;CAyDtC"}
+{"version":3,"file":"cvr-store.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/cvr-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAajD,OAAO,KAAK,EAAC,UAAU,EAAsB,MAAM,mBAAmB,CAAC;AAEvE,OAAO,KAAK,EAAQ,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAC,GAAG,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAC/C,OAAO,EAML,KAAK,OAAO,EAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,YAAY,EAEjB,KAAK,UAAU,EAEf,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,KAAK,EACV,KAAK,SAAS,EAGf,MAAM,mBAAmB,CAAC;AAI3B,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAuFF,qBAAa,QAAQ;;gBAaP,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM;IAOnD,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC;IAgF1B,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAIvD,mBAAmB,CAAC,EAAE,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS;IAIrD,YAAY,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI;IAIlC,WAAW,CAAC,EACV,OAAO,EACP,cAAc,EACd,UAAU,GACX,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,gBAAgB,GAAG,YAAY,CAAC,GAAG,IAAI;IAgBxE,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI;IAarE,QAAQ,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAqClC,WAAW,CAAC,KAAK,EAAE,WAAW;IA0B9B,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,GAAG,IAAI;IAS1E,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAexC,kBAAkB,CAChB,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACnB,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACpB,OAAO,EAAE,OAAO,GACf,IAAI;IAkBP,eAAe,CACb,aAAa,EAAE,UAAU,EACzB,KAAK,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,EACnB,MAAM,EAAE;QAAC,EAAE,EAAE,MAAM,CAAA;KAAC,GACnB,IAAI;IAYA,iBAAiB,CACtB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,EACpB,kBAAkB,GAAE,MAAM,EAAO,GAChC,cAAc,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC;IA8BvC,oBAAoB,CACxB,EAAE,EAAE,UAAU,EACd,YAAY,EAAE,kBAAkB,EAChC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC;IAgJtB,KAAK,CAAC,sBAAsB,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;CAYxE;AAOD,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,QAAQ,CAAC,IAAI,qCAAqC;gBAEtC,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAK3D"}

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

@@ -3,7 +3,7 @@ import { assert } from '../../../../shared/src/asserts.js';
 import { CustomKeyMap } from '../../../../shared/src/custom-key-map.js';
 import { deepEqual, } from '../../../../shared/src/json.js';
 import { must } from '../../../../shared/src/must.js';
-import { astSchema } from '../../../../zero-protocol/src/mod.js';
+import { astSchema } from '../../../../zero-protocol/src/ast.js';
 import { versionToLexi } from '../../types/lexi-version.js';
 import { rowIDHash } from '../../types/row-key.js';
 import { rowRecordToRowsRow, rowsRowToRowRecord, } from './schema/cvr.js';
@@ -48,6 +48,9 @@ class RowRecordCache {
             }
         }
     }
+    clear() {
+        this.#cache = undefined;
+    }
 }
 function asQuery(row) {
     const ast = astSchema.parse(row.clientAST);
@@ -88,28 +91,31 @@ export class CVRStore {
         const cvr = {
             id,
             version: { stateVersion: versionToLexi(0) },
-            lastActive: { epochMillis: 0 },
+            lastActive: 0,
+            replicaVersion: null,
             clients: {},
             queries: {},
         };
-        const [versionAndLastActive, clientsRows, queryRows, desiresRows] = await this.#db.begin(tx => [
-            tx `SELECT version, "lastActive" FROM cvr.instances WHERE "clientGroupID" = ${id}`,
+        const [instance, clientsRows, queryRows, desiresRows] = await this.#db.begin(tx => [
+            tx `SELECT "version", "lastActive", "replicaVersion" FROM cvr.instances WHERE "clientGroupID" = ${id}`,
             tx `SELECT "clientID", "patchVersion" FROM cvr.clients WHERE "clientGroupID" = ${id}`,
             tx `SELECT * FROM cvr.queries WHERE "clientGroupID" = ${id} AND (deleted IS NULL OR deleted = FALSE)`,
             tx `SELECT * FROM cvr.desires WHERE "clientGroupID" = ${id} AND (deleted IS NULL OR deleted = FALSE)`,
         ]);
-        if (versionAndLastActive.length !== 0) {
-            assert(versionAndLastActive.length === 1);
-            const { version, lastActive } = versionAndLastActive[0];
+        if (instance.length !== 0) {
+            assert(instance.length === 1);
+            const { version, lastActive, replicaVersion } = instance[0];
             cvr.version = versionFromString(version);
-            cvr.lastActive = { epochMillis: lastActive.getTime() };
+            cvr.lastActive = lastActive;
+            cvr.replicaVersion = replicaVersion;
         }
         else {
             // This is the first time we see this CVR.
             const change = {
                 clientGroupID: id,
                 version: versionString(cvr.version),
-                lastActive: new Date(0),
+                lastActive: 0,
+                replicaVersion: null,
             };
             this.#writes.add({
                 stats: { instances: 1 },
@@ -149,11 +155,12 @@ export class CVRStore {
     putRowRecord(row) {
         this.#pendingRowRecordPuts.set(row.id, row);
     }
-    putInstance(version, lastActive) {
+    putInstance({ version, replicaVersion, lastActive, }) {
         const change = {
             clientGroupID: this.#id,
             version: versionString(version),
-            lastActive: new Date(lastActive.epochMillis),
+            lastActive,
+            replicaVersion,
         };
         this.#writes.add({
             stats: { instances: 1 },
@@ -249,7 +256,11 @@ export class CVRStore {
         };
         this.#writes.add({
             stats: { desires: 1 },
-            write: tx => tx `INSERT INTO cvr.desires ${tx(change)}`,
+            write: tx => tx `
+      INSERT INTO cvr.desires ${tx(change)}
+        ON CONFLICT ("clientGroupID", "clientID", "queryHash")
+        DO UPDATE SET ${tx(change)}
+      `,
         });
     }
     delDesiredQuery(oldPutVersion, query, client) {
@@ -334,7 +345,15 @@ export class CVRStore {
         lc.debug?.(`${patches.length} config patches (${Date.now() - startMs} ms)`);
         return patches;
     }
-    async flush() {
+    async #abortIfNotVersion(tx, expectedCurrentVersion) {
+        const expected = versionString(expectedCurrentVersion);
+        const result = await tx `SELECT version FROM cvr.instances WHERE "clientGroupID" = ${this.#id}`.execute(); // Note: execute() immediately to send the query before others.
+        const currVersion = result.length === 0 ? versionToLexi(0) : result[0].version;
+        if (currVersion !== expected) {
+            throw new ConcurrentModificationException(expected, currVersion);
+        }
+    }
+    async #flush(expectedCurrentVersion) {
         const stats = {
             instances: 0,
             queries: 0,
@@ -351,15 +370,20 @@ export class CVRStore {
         });
         stats.rows = rowRecordsToFlush.length;
         await this.#db.begin(tx => {
+            const pipelined = [
+                // Test-and-set the version to guard against concurrent writes.
+                // TODO: Add homing logic.
+                this.#abortIfNotVersion(tx, expectedCurrentVersion),
+            ];
             if (this.#pendingRowRecordPuts.size > 0) {
                 const rowRecordRows = rowRecordsToFlush.map(r => rowRecordToRowsRow(this.#id, r));
                 let i = 0;
                 while (i < rowRecordRows.length) {
-                    void tx `INSERT INTO cvr.rows ${tx(rowRecordRows.slice(i, i + ROW_RECORD_UPSERT_BATCH_SIZE))} 
+                    pipelined.push(tx `INSERT INTO cvr.rows ${tx(rowRecordRows.slice(i, i + ROW_RECORD_UPSERT_BATCH_SIZE))} 
             ON CONFLICT ("clientGroupID", "schema", "table", "rowKey")
             DO UPDATE SET "rowVersion" = excluded."rowVersion",
               "patchVersion" = excluded."patchVersion",
-              "refCounts" = excluded."refCounts"`.execute();
+              "refCounts" = excluded."refCounts"`.execute());
                     i += ROW_RECORD_UPSERT_BATCH_SIZE;
                     stats.statements++;
                 }
@@ -369,18 +393,39 @@ export class CVRStore {
                 stats.queries += write.stats.queries ?? 0;
                 stats.desires += write.stats.desires ?? 0;
                 stats.clients += write.stats.clients ?? 0;
-                void write.write(tx).execute();
+                pipelined.push(write.write(tx).execute());
                 stats.statements++;
             }
+            // Make sure Errors thrown by pipelined statements
+            // are propagated up the stack.
+            return Promise.all(pipelined);
         });
         await this.#rowCache.flush(rowRecordsToFlush);
-        this.#writes.clear();
-        this.#pendingRowRecordPuts.clear();
         return stats;
     }
+    async flush(expectedCurrentVersion) {
+        try {
+            return await this.#flush(expectedCurrentVersion);
+        }
+        catch (e) {
+            // Clear cached state if an error (e.g. ConcurrentModificationException) is encountered.
+            this.#rowCache.clear();
+            throw e;
+        }
+        finally {
+            this.#writes.clear();
+            this.#pendingRowRecordPuts.clear();
+        }
+    }
 }
 // Max number of parameters for our sqlite build is 65534.
 // Each row record has 7 parameters (1 per column).
 // 65534 / 7 = 9362
 const ROW_RECORD_UPSERT_BATCH_SIZE = 9_360;
+export class ConcurrentModificationException extends Error {
+    name = 'ConcurrentModificationException';
+    constructor(expectedVersion, actualVersion) {
+        super(`CVR has been concurrently modified. Expected ${expectedVersion}, got ${actualVersion}`);
+    }
+}
 //# sourceMappingURL=cvr-store.js.map