@rocicorp/zero 0.0.0-202410031711

package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts

@@ -0,0 +1,103 @@
+import { LogContext } from '@rocicorp/logger';
+import type { RowKey } from '../../../../zero-cache/src/types/row-key.js';
+import type { TableSpec } from '../../../../zero-cache/src/types/specs.js';
+import type { AST } from '../../../../zql/src/zql/ast/ast.js';
+import type { Row } from '../../../../zql/src/zql/ivm/data.js';
+import type { ClientGroupStorage } from './database-storage.js';
+import { Snapshotter } from './snapshotter.js';
+export type RowAdd = {
+    readonly type: 'add';
+    readonly queryHash: string;
+    readonly table: string;
+    readonly rowKey: Row;
+    readonly row: Row;
+};
+export type RowRemove = {
+    readonly type: 'remove';
+    readonly queryHash: string;
+    readonly table: string;
+    readonly rowKey: Row;
+    readonly row: undefined;
+};
+export type RowEdit = {
+    readonly type: 'edit';
+    readonly queryHash: string;
+    readonly table: string;
+    readonly rowKey: Row;
+    readonly row: Row;
+};
+export type RowChange = RowAdd | RowRemove | RowEdit;
+/** Normalized TableSpec information for faster processing. */
+export type NormalizedTableSpec = TableSpec & {
+    readonly boolColumns: Set<string>;
+};
+export declare function normalize(tableSpec: TableSpec): NormalizedTableSpec;
+/**
+ * Manages the state of IVM pipelines for a given ViewSyncer (i.e. client group).
+ */
+export declare class PipelineDriver {
+    #private;
+    constructor(lc: LogContext, snapshotter: Snapshotter, storage: ClientGroupStorage);
+    /**
+     * Initializes the PipelineDriver to the current head of the database.
+     * Queries can then be added (i.e. hydrated) with {@link addQuery()}.
+     *
+     * Must only be called once.
+     */
+    init(): void;
+    /**
+     * @returns Whether the PipelineDriver has been initialized.
+     */
+    initialized(): boolean;
+    /**
+     * Returns the current version of the database. This will reflect the
+     * latest version change when calling {@link advance()} once the
+     * iteration has begun.
+     */
+    currentVersion(): string;
+    release(): void;
+    advanceWithoutDiff(): string;
+    /**
+     * Clears storage used for the pipelines. Call this when the
+     * PipelineDriver will no longer be used.
+     */
+    destroy(): void;
+    /** @return The Set of query hashes for all added queries. */
+    addedQueries(): Set<string>;
+    /**
+     * Adds a pipeline for the query. The method will hydrated the query using
+     * the the driver's current snapshot of the database and return a stream
+     * of results. Henceforth, updates to the query will be returned when the
+     * driver is {@link advance}d. The query and its pipeline can be removed with
+     * {@link removeQuery()}.
+     *
+     * @return The rows from the initial hydration of the query.
+     */
+    addQuery(hash: string, query: AST): Iterable<RowChange>;
+    /**
+     * Removes the pipeline for the query. This is a no-op if the query
+     * was not added.
+     */
+    removeQuery(hash: string): void;
+    /** Removes pipelines for all queries. */
+    clear(): void;
+    /**
+     * Returns the value of the row with the given primary key `pk`,
+     * or `undefined` if there is no such row. The pipeline must have been
+     * initialized.
+     */
+    getRow(table: string, pk: RowKey): Row | undefined;
+    /**
+     * Advances to the new head of the database.
+     *
+     * @return The resulting row changes for all added queries. Note that the
+     *         `changes` must be iterated over in their entirety in order to
+     *         advance the database snapshot.
+     */
+    advance(): {
+        version: string;
+        numChanges: number;
+        changes: Iterable<RowChange>;
+    };
+}
+//# sourceMappingURL=pipeline-driver.d.ts.map

package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline-driver.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/services/view-syncer/pipeline-driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAK5C,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,iCAAiC,CAAC;AAC5D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,wBAAwB,CAAC;AAGhD,OAAO,KAAK,EAAO,GAAG,EAAC,MAAM,yBAAyB,CAAC;AAKvD,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAoB,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAEhE,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;AAErD,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG;IAC5C,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,wBAAgB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,mBAAmB,CAcnE;AAED;;GAEG;AACH,qBAAa,cAAc;;gBAWvB,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,kBAAkB;IAO7B;;;;;OAKG;IACH,IAAI;IASJ;;OAEG;IACH,WAAW,IAAI,OAAO;IAItB;;;;OAIG;IACH,cAAc,IAAI,MAAM;IAKxB,OAAO;IAIP,kBAAkB,IAAI,MAAM;IAQ5B;;;OAGG;IACH,OAAO;IAKP,6DAA6D;IAC7D,YAAY,IAAI,GAAG,CAAC,MAAM,CAAC;IAI3B;;;;;;;;OAQG;IACF,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC;IA2BxD;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM;IAQxB,yCAAyC;IACzC,KAAK;IAOL;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS;IAMlD;;;;;;OAMG;IACH,OAAO,IAAI;QACT,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;KAC9B;CA+FF"}

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

@@ -0,0 +1,290 @@
+import { LogContext } from '@rocicorp/logger';
+import { assert, unreachable } from '../../../../shared/src/asserts.js';
+import { must } from '../../../../shared/src/must.js';
+import { listTables } from '../../../../zero-cache/src/db/lite-tables.js';
+import { mapLiteDataTypeToZqlSchemaValue } from '../../../../zero-cache/src/types/lite.js';
+import { buildPipeline } from '../../../../zql/src/zql/builder/builder.js';
+import { TableSource } from '../../../../zqlite/src/table-source.js';
+import { Snapshotter } from './snapshotter.js';
+export function normalize(tableSpec) {
+    const { primaryKey, columns } = tableSpec;
+    return {
+        ...tableSpec,
+        // Primary keys are normalized here so that downstream
+        // normalization does not need to create new objects.
+        // See row-key.ts: normalizedKeyOrder()
+        primaryKey: [...primaryKey].sort(),
+        boolColumns: new Set(Object.entries(columns)
+            .filter(([_, spec]) => spec.dataType === 'BOOL')
+            .map(([col]) => col)),
+    };
+}
+/**
+ * Manages the state of IVM pipelines for a given ViewSyncer (i.e. client group).
+ */
+export class PipelineDriver {
+    #tables = new Map();
+    #pipelines = new Map();
+    #lc;
+    #snapshotter;
+    #storage;
+    #tableSpecs = null;
+    #streamer = null;
+    constructor(lc, snapshotter, storage) {
+        this.#lc = lc;
+        this.#snapshotter = snapshotter;
+        this.#storage = storage;
+    }
+    /**
+     * Initializes the PipelineDriver to the current head of the database.
+     * Queries can then be added (i.e. hydrated) with {@link addQuery()}.
+     *
+     * Must only be called once.
+     */
+    init() {
+        assert(!this.#snapshotter.initialized(), 'Already initialized');
+        const { db } = this.#snapshotter.init().current();
+        this.#tableSpecs = new Map(listTables(db.db).map(spec => [spec.name, normalize(spec)]));
+    }
+    /**
+     * @returns Whether the PipelineDriver has been initialized.
+     */
+    initialized() {
+        return this.#snapshotter.initialized();
+    }
+    /**
+     * Returns the current version of the database. This will reflect the
+     * latest version change when calling {@link advance()} once the
+     * iteration has begun.
+     */
+    currentVersion() {
+        assert(this.initialized(), 'Not yet initialized');
+        return this.#snapshotter.current().version;
+    }
+    release() {
+        this.#snapshotter.release();
+    }
+    advanceWithoutDiff() {
+        const { db, version } = this.#snapshotter.advance().curr;
+        for (const table of this.#tables.values()) {
+            table.setDB(db.db);
+        }
+        return version;
+    }
+    /**
+     * Clears storage used for the pipelines. Call this when the
+     * PipelineDriver will no longer be used.
+     */
+    destroy() {
+        this.#storage.destroy();
+        this.#snapshotter.destroy();
+    }
+    /** @return The Set of query hashes for all added queries. */
+    addedQueries() {
+        return new Set(this.#pipelines.keys());
+    }
+    /**
+     * Adds a pipeline for the query. The method will hydrated the query using
+     * the the driver's current snapshot of the database and return a stream
+     * of results. Henceforth, updates to the query will be returned when the
+     * driver is {@link advance}d. The query and its pipeline can be removed with
+     * {@link removeQuery()}.
+     *
+     * @return The rows from the initial hydration of the query.
+     */
+    *addQuery(hash, query) {
+        assert(this.initialized());
+        assert(!this.#pipelines.has(hash), `query ${hash} already added`);
+        const input = buildPipeline(query, {
+            getSource: name => this.#getSource(name),
+            createStorage: () => this.#createStorage(),
+        }, undefined);
+        this.#pipelines.set(hash, input);
+        const schema = input.getSchema();
+        input.setOutput({
+            push: change => {
+                const streamer = this.#streamer;
+                assert(streamer, 'must #startAccumulating() before pushing changes');
+                streamer.accumulate(hash, schema, [change]);
+            },
+        });
+        const res = input.fetch({});
+        const streamer = new Streamer().accumulate(hash, schema, toAdds(res));
+        yield* streamer.stream();
+    }
+    /**
+     * Removes the pipeline for the query. This is a no-op if the query
+     * was not added.
+     */
+    removeQuery(hash) {
+        const input = this.#pipelines.get(hash);
+        if (input) {
+            this.#pipelines.delete(hash);
+            input.destroy();
+        }
+    }
+    /** Removes pipelines for all queries. */
+    clear() {
+        for (const input of this.#pipelines.values()) {
+            input.destroy();
+        }
+        this.#pipelines.clear();
+    }
+    /**
+     * Returns the value of the row with the given primary key `pk`,
+     * or `undefined` if there is no such row. The pipeline must have been
+     * initialized.
+     */
+    getRow(table, pk) {
+        assert(this.initialized(), 'Not yet initialized');
+        const source = must(this.#tables.get(table));
+        return source.getRow(pk);
+    }
+    /**
+     * Advances to the new head of the database.
+     *
+     * @return The resulting row changes for all added queries. Note that the
+     *         `changes` must be iterated over in their entirety in order to
+     *         advance the database snapshot.
+     */
+    advance() {
+        assert(this.initialized());
+        const diff = this.#snapshotter.advance();
+        const { prev, curr, changes } = diff;
+        this.#lc.debug?.(`${prev.version} => ${curr.version}: ${changes} changes`);
+        return {
+            version: curr.version,
+            numChanges: changes,
+            changes: this.#advance(diff),
+        };
+    }
+    *#advance(diff) {
+        for (const { table, prevValue, nextValue } of diff) {
+            if (prevValue) {
+                if (nextValue) {
+                    yield* this.#push(table, {
+                        type: 'edit',
+                        row: nextValue,
+                        oldRow: prevValue,
+                    });
+                }
+                else {
+                    yield* this.#push(table, { type: 'remove', row: prevValue });
+                }
+            }
+            else if (nextValue) {
+                yield* this.#push(table, { type: 'add', row: nextValue });
+            }
+        }
+        // Set the new snapshot on all TableSources.
+        const { curr } = diff;
+        for (const table of this.#tables.values()) {
+            table.setDB(curr.db.db);
+        }
+        this.#lc.debug?.(`Advanced to ${curr.version}`);
+    }
+    /** Implements `BuilderDelegate.getSource()` */
+    #getSource(tableName) {
+        assert(this.#tableSpecs, 'Pipelines have not be initialized');
+        let source = this.#tables.get(tableName);
+        if (source) {
+            return source;
+        }
+        const tableSpec = this.#tableSpecs.get(tableName);
+        if (!tableSpec) {
+            throw new Error(`Unknown table ${tableName}`);
+        }
+        const { columns, primaryKey } = tableSpec;
+        assert(primaryKey.length);
+        const { db } = this.#snapshotter.current();
+        source = new TableSource(db.db, tableName, Object.fromEntries(Object.entries(columns).map(([name, { dataType }]) => [
+            name,
+            mapLiteDataTypeToZqlSchemaValue(dataType),
+        ])), [primaryKey[0], ...primaryKey.slice(1)]);
+        this.#tables.set(tableName, source);
+        this.#lc.debug?.(`created TableSource for ${tableName}`);
+        return source;
+    }
+    /** Implements `BuilderDelegate.createStorage()` */
+    #createStorage() {
+        return this.#storage.createStorage();
+    }
+    *#push(table, change) {
+        const source = this.#tables.get(table);
+        assert(source, `TableSource for ${table} not found`);
+        this.#startAccumulating();
+        source.push(change);
+        yield* this.#stopAccumulating().stream();
+    }
+    #startAccumulating() {
+        assert(this.#streamer === null);
+        this.#streamer = new Streamer();
+    }
+    #stopAccumulating() {
+        const streamer = this.#streamer;
+        assert(streamer);
+        this.#streamer = null;
+        return streamer;
+    }
+}
+class Streamer {
+    #changes = [];
+    accumulate(hash, schema, changes) {
+        this.#changes.push([hash, schema, changes]);
+        return this;
+    }
+    *stream() {
+        for (const [hash, schema, changes] of this.#changes) {
+            yield* this.#streamChanges(hash, schema, changes);
+        }
+    }
+    *#streamChanges(queryHash, schema, changes) {
+        for (const change of changes) {
+            const { type } = change;
+            switch (type) {
+                case 'add':
+                case 'remove': {
+                    yield* this.#streamNodes(queryHash, schema, type, [change.node]);
+                    break;
+                }
+                case 'child': {
+                    const { child } = change;
+                    const childSchema = must(schema.relationships[child.relationshipName]);
+                    yield* this.#streamChanges(queryHash, childSchema, [child.change]);
+                    break;
+                }
+                case 'edit':
+                    yield* this.#streamNodes(queryHash, schema, type, [
+                        { row: change.row, relationships: {} },
+                    ]);
+                    break;
+                default:
+                    unreachable(type);
+            }
+        }
+    }
+    *#streamNodes(queryHash, schema, op, nodes) {
+        const { tableName: table, primaryKey } = schema;
+        for (const node of nodes) {
+            const { relationships, row } = node;
+            const rowKey = Object.fromEntries(primaryKey.map(col => [col, row[col]]));
+            yield {
+                type: op,
+                queryHash,
+                table,
+                rowKey,
+                row: op === 'remove' ? undefined : row,
+            };
+            for (const [relationship, children] of Object.entries(relationships)) {
+                const childSchema = must(schema.relationships[relationship]);
+                yield* this.#streamNodes(queryHash, childSchema, op, children);
+            }
+        }
+    }
+}
+function* toAdds(nodes) {
+    for (const node of nodes) {
+        yield { type: 'add', node };
+    }
+}
+//# sourceMappingURL=pipeline-driver.js.map

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

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

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

@@ -0,0 +1,54 @@
+import type { LogContext } from '@rocicorp/logger';
+import type postgres from 'postgres';
+import { type JSONObject, type JSONValue } from '../../../types/bigint-json.js';
+import { type RowID, type RowRecord } from './types.js';
+export declare const PG_SCHEMA = "cvr";
+export type InstancesRow = {
+    clientGroupID: string;
+    version: string;
+    lastActive: Date;
+};
+export declare function compareInstancesRows(a: InstancesRow, b: InstancesRow): number;
+export type ClientsRow = {
+    clientGroupID: string;
+    clientID: string;
+    patchVersion: string;
+    deleted: boolean | null;
+};
+export declare function compareClientsRows(a: ClientsRow, b: ClientsRow): number;
+export type QueriesRow = {
+    clientGroupID: string;
+    queryHash: string;
+    clientAST: JSONValue;
+    patchVersion: string | null;
+    transformationHash: string | null;
+    transformationVersion: string | null;
+    internal: boolean | null;
+    deleted: boolean | null;
+};
+export declare function compareQueriesRows(a: QueriesRow, b: QueriesRow): number;
+export type DesiresRow = {
+    clientGroupID: string;
+    clientID: string;
+    queryHash: string;
+    patchVersion: string;
+    deleted: boolean | null;
+};
+export declare function compareDesiresRows(a: DesiresRow, b: DesiresRow): number;
+export type RowsRow = {
+    clientGroupID: string;
+    schema: string;
+    table: string;
+    rowKey: JSONObject;
+    rowVersion: string;
+    patchVersion: string;
+    refCounts: {
+        [queryHash: string]: number;
+    } | null;
+};
+export declare function rowsRowToRowID(rowsRow: RowsRow): RowID;
+export declare function rowsRowToRowRecord(rowsRow: RowsRow): RowRecord;
+export declare function rowRecordToRowsRow(clientGroupID: string, rowRecord: RowRecord): RowsRow;
+export declare function compareRowsRows(a: RowsRow, b: RowsRow): number;
+export declare function setupCVRTables(lc: LogContext, db: postgres.TransactionSql): Promise<void>;
+//# sourceMappingURL=cvr.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"cvr.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/cvr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,EACL,KAAK,UAAU,EACf,KAAK,SAAS,EAEf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,KAAK,KAAK,EACV,KAAK,SAAS,EAGf,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,SAAS,QAAQ,CAAC;AAI/B,MAAM,MAAM,YAAY,GAAG;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAUF,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,UAEpE;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB,CAAC;AAoBF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,UAM9D;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB,CAAC;AAwBF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,UAM9D;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB,CAAC;AA0BF,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,UAU9D;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE;QAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,GAAG,IAAI,CAAC;CACjD,CAAC;AAEF,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,CAMtD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,CAO9D;AAED,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,SAAS,GACnB,OAAO,CAUT;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,UAiBrD;AAmCD,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,QAAQ,CAAC,cAAc,iBAI5B"}

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

@@ -0,0 +1,181 @@
+import { stringCompare } from '../../../../../shared/src/string-compare.js';
+import { normalizedKeyOrder } from '../../../../../zero-cache/src/types/row-key.js';
+import { stringify, } from '../../../types/bigint-json.js';
+import { versionFromString, versionString, } from './types.js';
+export const PG_SCHEMA = 'cvr';
+const CREATE_CVR_SCHEMA = `CREATE SCHEMA IF NOT EXISTS cvr;`;
+const CREATE_CVR_INSTANCES_TABLE = `
+CREATE TABLE cvr.instances (
+  "clientGroupID" TEXT PRIMARY KEY,
+  version         TEXT NOT NULL,        -- Sortable representation of CVRVersion, e.g. "5nbqa2w:09"
+  "lastActive"    TIMESTAMPTZ NOT NULL -- For garbage collection
+);
+`;
+export function compareInstancesRows(a, b) {
+    return stringCompare(a.clientGroupID, b.clientGroupID);
+}
+const CREATE_CVR_CLIENTS_TABLE = `
+CREATE TABLE cvr.clients (
+  "clientGroupID"      TEXT,
+  "clientID"           TEXT,
+  "patchVersion"       TEXT NOT NULL,  -- Version at which added or deleted
+  deleted              BOOL,           -- put vs del client patch
+
+  PRIMARY KEY ("clientGroupID", "clientID"),
+
+  CONSTRAINT fk_clients_client_group
+    FOREIGN KEY("clientGroupID")
+    REFERENCES cvr.instances("clientGroupID")
+);
+
+-- For catchup patches.
+CREATE INDEX client_patch_version ON cvr.clients ("patchVersion");
+`;
+export function compareClientsRows(a, b) {
+    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
+    if (clientGroupIDComp !== 0) {
+        return clientGroupIDComp;
+    }
+    return stringCompare(a.clientID, b.clientID);
+}
+const CREATE_CVR_QUERIES_TABLE = `
+CREATE TABLE cvr.queries (
+  "clientGroupID"         TEXT,
+  "queryHash"             TEXT,
+  "clientAST"             JSONB NOT NULL,
+  "patchVersion"          TEXT,  -- NULL if only desired but not yet "got"
+  "transformationHash"    TEXT,
+  "transformationVersion" TEXT,
+  "internal"              BOOL,  -- If true, no need to track / send patches
+  "deleted"               BOOL,  -- put vs del "got" query
+
+  PRIMARY KEY ("clientGroupID", "queryHash"),
+
+  CONSTRAINT fk_queries_client_group
+    FOREIGN KEY("clientGroupID")
+    REFERENCES cvr.instances("clientGroupID")
+);
+
+-- For catchup patches.
+CREATE INDEX queries_patch_version ON cvr.queries ("patchVersion" NULLS FIRST);
+`;
+export function compareQueriesRows(a, b) {
+    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
+    if (clientGroupIDComp !== 0) {
+        return clientGroupIDComp;
+    }
+    return stringCompare(a.queryHash, b.queryHash);
+}
+const CREATE_CVR_DESIRES_TABLE = `
+CREATE TABLE cvr.desires (
+  "clientGroupID"      TEXT,
+  "clientID"           TEXT,
+  "queryHash"          TEXT,
+  "patchVersion"       TEXT NOT NULL,
+  "deleted"            BOOL,  -- put vs del "desired" query
+
+  PRIMARY KEY ("clientGroupID", "clientID", "queryHash"),
+
+  CONSTRAINT fk_desires_client
+    FOREIGN KEY("clientGroupID", "clientID")
+    REFERENCES cvr.clients("clientGroupID", "clientID"),
+
+  CONSTRAINT fk_desires_query
+    FOREIGN KEY("clientGroupID", "queryHash")
+    REFERENCES cvr.queries("clientGroupID", "queryHash")
+    ON DELETE CASCADE
+);
+
+-- For catchup patches.
+CREATE INDEX desires_patch_version ON cvr.desires ("patchVersion");
+`;
+export function compareDesiresRows(a, b) {
+    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
+    if (clientGroupIDComp !== 0) {
+        return clientGroupIDComp;
+    }
+    const clientIDComp = stringCompare(a.clientID, b.clientID);
+    if (clientIDComp !== 0) {
+        return clientIDComp;
+    }
+    return stringCompare(a.queryHash, b.queryHash);
+}
+export function rowsRowToRowID(rowsRow) {
+    return {
+        schema: rowsRow.schema,
+        table: rowsRow.table,
+        rowKey: rowsRow.rowKey,
+    };
+}
+export function rowsRowToRowRecord(rowsRow) {
+    return {
+        id: rowsRowToRowID(rowsRow),
+        rowVersion: rowsRow.rowVersion,
+        patchVersion: versionFromString(rowsRow.patchVersion),
+        refCounts: rowsRow.refCounts,
+    };
+}
+export function rowRecordToRowsRow(clientGroupID, rowRecord) {
+    return {
+        clientGroupID,
+        schema: rowRecord.id.schema,
+        table: rowRecord.id.table,
+        rowKey: rowRecord.id.rowKey,
+        rowVersion: rowRecord.rowVersion,
+        patchVersion: versionString(rowRecord.patchVersion),
+        refCounts: rowRecord.refCounts,
+    };
+}
+export function compareRowsRows(a, b) {
+    const clientGroupIDComp = stringCompare(a.clientGroupID, b.clientGroupID);
+    if (clientGroupIDComp !== 0) {
+        return clientGroupIDComp;
+    }
+    const schemaComp = stringCompare(a.schema, b.schema);
+    if (schemaComp !== 0) {
+        return schemaComp;
+    }
+    const tableComp = stringCompare(b.table, b.table);
+    if (tableComp !== 0) {
+        return tableComp;
+    }
+    return stringCompare(stringifySorted(a.rowKey), stringifySorted(b.rowKey));
+}
+const CREATE_CVR_ROWS_TABLE = `
+CREATE TABLE cvr.rows (
+  "clientGroupID"    TEXT,
+  "schema"           TEXT,
+  "table"            TEXT,
+  "rowKey"           JSONB,
+  "rowVersion"       TEXT NOT NULL,
+  "patchVersion"     TEXT NOT NULL,
+  "refCounts"        JSONB,  -- {[queryHash: string]: number}, NULL for tombstone
+
+  PRIMARY KEY ("clientGroupID", "schema", "table", "rowKey"),
+
+  CONSTRAINT fk_rows_client_group
+    FOREIGN KEY("clientGroupID")
+    REFERENCES cvr.instances("clientGroupID")
+);
+
+-- For catchup patches.
+CREATE INDEX row_patch_version ON cvr.rows ("patchVersion");
+
+-- For listing rows returned by one or more query hashes. e.g.
+-- SELECT * FROM cvr.rows WHERE "refCounts" ?| array[...queryHashes...];
+CREATE INDEX row_ref_counts ON cvr.rows USING GIN ("refCounts");
+`;
+const CREATE_CVR_TABLES = CREATE_CVR_SCHEMA +
+    CREATE_CVR_INSTANCES_TABLE +
+    CREATE_CVR_CLIENTS_TABLE +
+    CREATE_CVR_QUERIES_TABLE +
+    CREATE_CVR_DESIRES_TABLE +
+    CREATE_CVR_ROWS_TABLE;
+export async function setupCVRTables(lc, db) {
+    lc.info?.(`Setting up CVR tables`);
+    await db.unsafe(CREATE_CVR_TABLES);
+}
+function stringifySorted(r) {
+    return stringify(normalizedKeyOrder(r));
+}
+//# sourceMappingURL=cvr.js.map

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

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

package/out/zero-cache/src/services/view-syncer/schema/pg-migrations.d.ts

@@ -0,0 +1,4 @@
+import type { LogContext } from '@rocicorp/logger';
+import type postgres from 'postgres';
+export declare function initViewSyncerSchema(log: LogContext, db: postgres.Sql): Promise<void>;
+//# sourceMappingURL=pg-migrations.d.ts.map

package/out/zero-cache/src/services/view-syncer/schema/pg-migrations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pg-migrations.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/pg-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAOrC,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,UAAU,EACf,EAAE,EAAE,QAAQ,CAAC,GAAG,GACf,OAAO,CAAC,IAAI,CAAC,CAef"}