@rocicorp/zero 0.25.0 → 0.26.0-canary.0

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

@@ -1,146 +1,222 @@
-import { runSchemaMigrations, } from "../../../db/migration.js";
+import { runSchemaMigrations } from "../../../db/migration.js";
 import { cvrSchema } from "../../../types/shards.js";
-import { createRowsVersionTable, setupCVRTables } from "./cvr.js";
-export async function initViewSyncerSchema(log, db, shard) {
-    const schema = cvrSchema(shard);
-    const setupMigration = {
-        migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),
-        minSafeVersion: 1,
-    };
-    const migrateV1toV2 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "replicaVersion" TEXT`;
-        },
-    };
-    const migrateV2ToV3 = {
-        migrateSchema: async (_, tx) => {
-            await tx.unsafe(createRowsVersionTable(shard));
-        },
-        /** Populates the cvr.rowsVersion table with versions from cvr.instances. */
-        migrateData: async (lc, tx) => {
-            const pending = [];
-            for await (const versions of tx `
-      SELECT "clientGroupID", "version" FROM ${tx(schema)}.instances`.cursor(5000)) {
-                for (const version of versions) {
-                    pending.push(tx `INSERT INTO ${tx(schema)}."rowsVersion" ${tx(version)} 
+import { setupCVRTables, createRowsVersionTable } from "./cvr.js";
+async function initViewSyncerSchema(log, db, shard) {
+  const schema = cvrSchema(shard);
+  const setupMigration = {
+    migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),
+    minSafeVersion: 1
+  };
+  const migrateV1toV2 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "replicaVersion" TEXT`;
+    }
+  };
+  const migrateV2ToV3 = {
+    migrateSchema: async (_, tx) => {
+      await tx.unsafe(createRowsVersionTable(shard));
+    },
+    /** Populates the cvr.rowsVersion table with versions from cvr.instances. */
+    migrateData: async (lc, tx) => {
+      const pending = [];
+      for await (const versions of tx`
+      SELECT "clientGroupID", "version" FROM ${tx(schema)}.instances`.cursor(
+        5e3
+      )) {
+        for (const version of versions) {
+          pending.push(
+            tx`INSERT INTO ${tx(schema)}."rowsVersion" ${tx(version)} 
                ON CONFLICT ("clientGroupID")
-               DO UPDATE SET ${tx(version)}`.execute());
-                }
-            }
-            lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);
-            await Promise.all(pending);
-        },
-    };
-    const migrateV3ToV4 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "owner" TEXT`;
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "grantedAt" TIMESTAMPTZ`;
-        },
-    };
-    const migrateV5ToV6 = {
-        migrateSchema: async (_, tx) => {
-            await tx `
+               DO UPDATE SET ${tx(version)}`.execute()
+          );
+        }
+      }
+      lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);
+      await Promise.all(pending);
+    }
+  };
+  const migrateV3ToV4 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "owner" TEXT`;
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "grantedAt" TIMESTAMPTZ`;
+    }
+  };
+  const migrateV5ToV6 = {
+    migrateSchema: async (_, tx) => {
+      await tx`
       ALTER TABLE ${tx(schema)}."rows"
         DROP CONSTRAINT fk_rows_client_group`;
-            await tx `
+      await tx`
       ALTER TABLE ${tx(schema)}."rowsVersion"
         DROP CONSTRAINT fk_rows_version_client_group`;
-        },
-    };
-    const migrateV6ToV7 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "expiresAt" TIMESTAMPTZ`;
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "inactivatedAt" TIMESTAMPTZ`;
-            await tx `ALTER TABLE ${tx(schema)}.desires ADD "ttl" INTERVAL`;
-            await tx `CREATE INDEX desires_expires_at ON ${tx(schema)}.desires ("expiresAt")`;
-            await tx `CREATE INDEX desires_inactivated_at ON ${tx(schema)}.desires ("inactivatedAt")`;
-        },
-    };
-    const migrateV7ToV8 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}."desires" DROP CONSTRAINT fk_desires_client`;
-        },
-    };
-    const migrateV8ToV9 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD "clientSchema" JSONB`;
-        },
-    };
-    const migrateV9ToV10 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.queries ADD "queryName" TEXT`;
-            await tx `ALTER TABLE ${tx(schema)}.queries ADD "queryArgs" JSONB`;
-            await tx `ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "clientAST" DROP NOT NULL`;
-        },
-    };
-    const migrateV10ToV11 = {
-        migrateSchema: async (_, tx) => {
-            await tx `DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;
-            await tx `ALTER TABLE ${tx(schema)}.desires DROP COLUMN "expiresAt"`;
-            await tx `DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;
-            await tx `ALTER TABLE ${tx(schema)}.clients DROP COLUMN "patchVersion"`;
-            await tx `ALTER TABLE ${tx(schema)}.clients DROP COLUMN "deleted"`;
-        },
-    };
-    const migratedV11ToV12 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "queryArgs" TYPE JSON USING "queryArgs"::JSON`;
-        },
-    };
-    const migratedV12ToV13 = {
-        migrateSchema: async (_, tx) => {
-            await tx `ALTER TABLE ${tx(schema)}.instances ADD COLUMN "ttlClock" DOUBLE PRECISION NOT NULL DEFAULT 0`;
-        },
-    };
-    const migratedV13ToV14 = {
-        migrateSchema: async (_, sql) => {
-            await sql `
+    }
+  };
+  const migrateV6ToV7 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.desires ADD "expiresAt" TIMESTAMPTZ`;
+      await tx`ALTER TABLE ${tx(
+        schema
+      )}.desires ADD "inactivatedAt" TIMESTAMPTZ`;
+      await tx`ALTER TABLE ${tx(schema)}.desires ADD "ttl" INTERVAL`;
+      await tx`CREATE INDEX desires_expires_at ON ${tx(
+        schema
+      )}.desires ("expiresAt")`;
+      await tx`CREATE INDEX desires_inactivated_at ON ${tx(
+        schema
+      )}.desires ("inactivatedAt")`;
+    }
+  };
+  const migrateV7ToV8 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(
+        schema
+      )}."desires" DROP CONSTRAINT fk_desires_client`;
+    }
+  };
+  const migrateV8ToV9 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD "clientSchema" JSONB`;
+    }
+  };
+  const migrateV9ToV10 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.queries ADD "queryName" TEXT`;
+      await tx`ALTER TABLE ${tx(schema)}.queries ADD "queryArgs" JSONB`;
+      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "clientAST" DROP NOT NULL`;
+    }
+  };
+  const migrateV10ToV11 = {
+    migrateSchema: async (_, tx) => {
+      await tx`DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;
+      await tx`ALTER TABLE ${tx(schema)}.desires DROP COLUMN "expiresAt"`;
+      await tx`DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;
+      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN "patchVersion"`;
+      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN "deleted"`;
+    }
+  };
+  const migratedV11ToV12 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN "queryArgs" TYPE JSON USING "queryArgs"::JSON`;
+    }
+  };
+  const migratedV12ToV13 = {
+    migrateSchema: async (_, tx) => {
+      await tx`ALTER TABLE ${tx(schema)}.instances ADD COLUMN "ttlClock" DOUBLE PRECISION NOT NULL DEFAULT 0`;
+    }
+  };
+  const migratedV13ToV14 = {
+    migrateSchema: async (_, sql) => {
+      await sql`
         CREATE INDEX instances_last_active ON ${sql(schema)}.instances ("lastActive");
       `;
-            // Update / add foreign key constraints to cascade deletes.
-            for (const [table, reference] of [
-                ['clients', 'instances'],
-                ['queries', 'instances'],
-                ['rows', 'rowsVersion'],
-            ]) {
-                const constraint = sql(`fk_${table}_client_group`);
-                await sql `
+      for (const [table, reference] of [
+        ["clients", "instances"],
+        ["queries", "instances"],
+        ["rows", "rowsVersion"]
+      ]) {
+        const constraint = sql(`fk_${table}_client_group`);
+        await sql`
           ALTER TABLE ${sql(schema)}.${sql(table)} DROP CONSTRAINT IF EXISTS ${constraint}`;
-                await sql `
+        await sql`
           ALTER TABLE ${sql(schema)}.${sql(table)} ADD CONSTRAINT ${constraint}
             FOREIGN KEY("clientGroupID")
             REFERENCES ${sql(schema)}.${sql(reference)} ("clientGroupID")
             ON DELETE CASCADE;
         `;
-            }
-        },
-    };
-    const schemaVersionMigrationMap = {
-        2: migrateV1toV2,
-        3: migrateV2ToV3,
-        4: migrateV3ToV4,
-        // v5 enables asynchronous row-record flushing, and thus relies on
-        // the logic that updates and checks the rowsVersion table in v3.
-        5: { minSafeVersion: 3 },
-        6: migrateV5ToV6,
-        7: migrateV6ToV7,
-        8: migrateV7ToV8,
-        9: migrateV8ToV9,
-        // v10 adds queryName and queryArgs to the queries table to support
-        // custom queries. clientAST is now optional to support migrating
-        // off client queries.
-        10: migrateV9ToV10,
-        // V11 removes the deprecated queries."expiresAt", clients."patchVersion",
-        // clients."deleted" columns.
-        11: migrateV10ToV11,
-        12: migratedV11ToV12,
-        // V13 adds instances."ttlClock"
-        13: migratedV12ToV13,
-        // V14 adds an index on instances."lastActive" and a FK constraint
-        // from rows."clientGroupID" to rowsVersion."clientGroupID" for
-        // garbage collection
-        14: migratedV13ToV14,
-    };
-    await runSchemaMigrations(log, 'view-syncer', cvrSchema(shard), db, setupMigration, schemaVersionMigrationMap);
+      }
+    }
+  };
+  const migratedV14ToV15 = {
+    migrateSchema: async (_, sql) => {
+      await sql`ALTER TABLE ${sql(schema)}.desires 
+        ADD COLUMN "inactivatedAtMs" DOUBLE PRECISION`;
+      await sql`ALTER TABLE ${sql(schema)}.desires 
+        ADD COLUMN "ttlMs" DOUBLE PRECISION`;
+    },
+    // Migrate existing data: convert TIMESTAMPTZ to milliseconds for inactivatedAt
+    // and INTERVAL to milliseconds for ttl
+    // Note: EXTRACT(EPOCH FROM NULL) returns NULL, so NULL values are preserved
+    migrateData: async (lc, sql) => {
+      lc.info?.(
+        "Migrating desires.inactivatedAt to inactivatedAtMs and ttl to ttlMs"
+      );
+      await sql`
+        UPDATE ${sql(schema)}.desires
+        SET "inactivatedAtMs" = EXTRACT(EPOCH FROM "inactivatedAt") * 1000,
+            "ttlMs" = EXTRACT(EPOCH FROM "ttl") * 1000
+      `;
+    }
+  };
+  const migratedV15ToV16 = {
+    migrateSchema: async (_, sql) => {
+      await sql`ALTER TABLE ${sql(schema)}.instances ADD COLUMN "profileID" TEXT`;
+      await sql`ALTER TABLE ${sql(schema)}.instances ADD COLUMN "deleted" BOOL DEFAULT FALSE`;
+      await sql`
+        DROP INDEX IF EXISTS ${sql(schema)}.instances_last_active`;
+      await sql`
+        CREATE INDEX instances_last_active ON ${sql(schema)}.instances ("lastActive")
+          WHERE NOT "deleted"`;
+      await sql`
+        CREATE INDEX tombstones_last_active ON ${sql(schema)}.instances ("lastActive")
+          WHERE "deleted"`;
+      await sql`
+        CREATE INDEX profile_ids_last_active ON ${sql(schema)}.instances ("lastActive", "profileID")
+          WHERE "profileID" IS NOT NULL`;
+    },
+    // Backfill profileIDs to the `cg${clientGroupID}`, as is done for
+    // client groups from old zero-clients that don't send a profileID.
+    migrateData: async (lc, sql) => {
+      lc.info?.("Backfilling instance.profileIDs");
+      await sql`
+        UPDATE ${sql(schema)}.instances
+        SET "profileID" = 'cg' || "clientGroupID"
+        WHERE "profileID" IS NULL
+      `;
+    }
+  };
+  const schemaVersionMigrationMap = {
+    2: migrateV1toV2,
+    3: migrateV2ToV3,
+    4: migrateV3ToV4,
+    // v5 enables asynchronous row-record flushing, and thus relies on
+    // the logic that updates and checks the rowsVersion table in v3.
+    5: { minSafeVersion: 3 },
+    6: migrateV5ToV6,
+    7: migrateV6ToV7,
+    8: migrateV7ToV8,
+    9: migrateV8ToV9,
+    // v10 adds queryName and queryArgs to the queries table to support
+    // custom queries. clientAST is now optional to support migrating
+    // off client queries.
+    10: migrateV9ToV10,
+    // V11 removes the deprecated queries."expiresAt", clients."patchVersion",
+    // clients."deleted" columns.
+    11: migrateV10ToV11,
+    12: migratedV11ToV12,
+    // V13 adds instances."ttlClock"
+    13: migratedV12ToV13,
+    // V14 adds an index on instances."lastActive" and a FK constraint
+    // from rows."clientGroupID" to rowsVersion."clientGroupID" for
+    // garbage collection
+    14: migratedV13ToV14,
+    // V15 adds desires."inactivatedAtTTLClock" to store TTLClock values
+    // directly as DOUBLE PRECISION, avoiding postgres.js TIMESTAMPTZ
+    // type conversion issues
+    15: migratedV14ToV15,
+    // V16 adds instances."profileID" and a corresponding index for estimating
+    // active user counts more accurately for apps that use memstore.
+    16: migratedV15ToV16
+  };
+  await runSchemaMigrations(
+    log,
+    "view-syncer",
+    cvrSchema(shard),
+    db,
+    setupMigration,
+    schemaVersionMigrationMap
+  );
 }
-//# sourceMappingURL=init.js.map
+export {
+  initViewSyncerSchema
+};
+//# sourceMappingURL=init.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sources":["../../../../../../../zero-cache/src/services/view-syncer/schema/init.ts"],"sourcesContent":["import type {LogContext} from '@rocicorp/logger';\nimport type {PendingQuery, Row} from 'postgres';\nimport {\n  runSchemaMigrations,\n  type IncrementalMigrationMap,\n  type Migration,\n} from '../../../db/migration.ts';\nimport type {PostgresDB} from '../../../types/pg.ts';\nimport {cvrSchema, type ShardID} from '../../../types/shards.ts';\nimport {createRowsVersionTable, setupCVRTables} from './cvr.ts';\n\nexport async function initViewSyncerSchema(\n  log: LogContext,\n  db: PostgresDB,\n  shard: ShardID,\n): Promise<void> {\n  const schema = cvrSchema(shard);\n\n  const setupMigration: Migration = {\n    migrateSchema: (lc, tx) => setupCVRTables(lc, tx, shard),\n    minSafeVersion: 1,\n  };\n\n  const migrateV1toV2: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"replicaVersion\" TEXT`;\n    },\n  };\n\n  const migrateV2ToV3: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx.unsafe(createRowsVersionTable(shard));\n    },\n\n    /** Populates the cvr.rowsVersion table with versions from cvr.instances. */\n    migrateData: async (lc, tx) => {\n      const pending: PendingQuery<Row[]>[] = [];\n      for await (const versions of tx<\n        {clientGroupID: string; version: string}[]\n      >`\n      SELECT \"clientGroupID\", \"version\" FROM ${tx(schema)}.instances`.cursor(\n        5000,\n      )) {\n        for (const version of versions) {\n          pending.push(\n            tx`INSERT INTO ${tx(schema)}.\"rowsVersion\" ${tx(version)} \n               ON CONFLICT (\"clientGroupID\")\n               DO UPDATE SET ${tx(version)}`.execute(),\n          );\n        }\n      }\n      lc.info?.(`initializing rowsVersion for ${pending.length} cvrs`);\n      await Promise.all(pending);\n    },\n  };\n\n  const migrateV3ToV4: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"owner\" TEXT`;\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"grantedAt\" TIMESTAMPTZ`;\n    },\n  };\n\n  const migrateV5ToV6: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`\n      ALTER TABLE ${tx(schema)}.\"rows\"\n        DROP CONSTRAINT fk_rows_client_group`;\n      await tx`\n      ALTER TABLE ${tx(schema)}.\"rowsVersion\"\n        DROP CONSTRAINT fk_rows_version_client_group`;\n    },\n  };\n\n  const migrateV6ToV7: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.desires ADD \"expiresAt\" TIMESTAMPTZ`;\n      await tx`ALTER TABLE ${tx(\n        schema,\n      )}.desires ADD \"inactivatedAt\" TIMESTAMPTZ`;\n      await tx`ALTER TABLE ${tx(schema)}.desires ADD \"ttl\" INTERVAL`;\n\n      await tx`CREATE INDEX desires_expires_at ON ${tx(\n        schema,\n      )}.desires (\"expiresAt\")`;\n      await tx`CREATE INDEX desires_inactivated_at ON ${tx(\n        schema,\n      )}.desires (\"inactivatedAt\")`;\n    },\n  };\n\n  const migrateV7ToV8: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(\n        schema,\n      )}.\"desires\" DROP CONSTRAINT fk_desires_client`;\n    },\n  };\n\n  const migrateV8ToV9: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD \"clientSchema\" JSONB`;\n    },\n  };\n\n  const migrateV9ToV10: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.queries ADD \"queryName\" TEXT`;\n      await tx`ALTER TABLE ${tx(schema)}.queries ADD \"queryArgs\" JSONB`;\n      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN \"clientAST\" DROP NOT NULL`;\n    },\n  };\n\n  const migrateV10ToV11: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`DROP INDEX IF EXISTS ${tx(schema)}.desires_expires_at`;\n      await tx`ALTER TABLE ${tx(schema)}.desires DROP COLUMN \"expiresAt\"`;\n      await tx`DROP INDEX IF EXISTS ${tx(schema)}.client_patch_version`;\n      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN \"patchVersion\"`;\n      await tx`ALTER TABLE ${tx(schema)}.clients DROP COLUMN \"deleted\"`;\n    },\n  };\n\n  const migratedV11ToV12: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.queries ALTER COLUMN \"queryArgs\" TYPE JSON USING \"queryArgs\"::JSON`;\n    },\n  };\n\n  const migratedV12ToV13: Migration = {\n    migrateSchema: async (_, tx) => {\n      await tx`ALTER TABLE ${tx(schema)}.instances ADD COLUMN \"ttlClock\" DOUBLE PRECISION NOT NULL DEFAULT 0`;\n    },\n  };\n\n  const migratedV13ToV14: Migration = {\n    migrateSchema: async (_, sql) => {\n      await sql`\n        CREATE INDEX instances_last_active ON ${sql(schema)}.instances (\"lastActive\");\n      `;\n\n      // Update / add foreign key constraints to cascade deletes.\n      for (const [table, reference] of [\n        ['clients', 'instances'],\n        ['queries', 'instances'],\n        ['rows', 'rowsVersion'],\n      ] as [string, string][]) {\n        const constraint = sql(`fk_${table}_client_group`);\n        await sql`\n          ALTER TABLE ${sql(schema)}.${sql(table)} DROP CONSTRAINT IF EXISTS ${constraint}`;\n        await sql`\n          ALTER TABLE ${sql(schema)}.${sql(table)} ADD CONSTRAINT ${constraint}\n            FOREIGN KEY(\"clientGroupID\")\n            REFERENCES ${sql(schema)}.${sql(reference)} (\"clientGroupID\")\n            ON DELETE CASCADE;\n        `;\n      }\n    },\n  };\n\n  const migratedV14ToV15: Migration = {\n    migrateSchema: async (_, sql) => {\n      // Add new columns for storing inactivatedAt and ttl in milliseconds.\n      // This avoids postgres.js type conversion issues with TIMESTAMPTZ and INTERVAL.\n      await sql`ALTER TABLE ${sql(schema)}.desires \n        ADD COLUMN \"inactivatedAtMs\" DOUBLE PRECISION`;\n      await sql`ALTER TABLE ${sql(schema)}.desires \n        ADD COLUMN \"ttlMs\" DOUBLE PRECISION`;\n    },\n    // Migrate existing data: convert TIMESTAMPTZ to milliseconds for inactivatedAt\n    // and INTERVAL to milliseconds for ttl\n    // Note: EXTRACT(EPOCH FROM NULL) returns NULL, so NULL values are preserved\n    migrateData: async (lc, sql) => {\n      lc.info?.(\n        'Migrating desires.inactivatedAt to inactivatedAtMs and ttl to ttlMs',\n      );\n      await sql`\n        UPDATE ${sql(schema)}.desires\n        SET \"inactivatedAtMs\" = EXTRACT(EPOCH FROM \"inactivatedAt\") * 1000,\n            \"ttlMs\" = EXTRACT(EPOCH FROM \"ttl\") * 1000\n      `;\n    },\n  };\n\n  const migratedV15ToV16: Migration = {\n    migrateSchema: async (_, sql) => {\n      await sql`ALTER TABLE ${sql(schema)}.instances ADD COLUMN \"profileID\" TEXT`;\n      await sql`ALTER TABLE ${sql(schema)}.instances ADD COLUMN \"deleted\" BOOL DEFAULT FALSE`;\n\n      // Recreate the instances_last_active index to exclude tombstones\n      await sql`\n        DROP INDEX IF EXISTS ${sql(schema)}.instances_last_active`;\n      await sql`\n        CREATE INDEX instances_last_active ON ${sql(schema)}.instances (\"lastActive\")\n          WHERE NOT \"deleted\"`;\n      await sql`\n        CREATE INDEX tombstones_last_active ON ${sql(schema)}.instances (\"lastActive\")\n          WHERE \"deleted\"`;\n      await sql`\n        CREATE INDEX profile_ids_last_active ON ${sql(schema)}.instances (\"lastActive\", \"profileID\")\n          WHERE \"profileID\" IS NOT NULL`;\n    },\n\n    // Backfill profileIDs to the `cg${clientGroupID}`, as is done for\n    // client groups from old zero-clients that don't send a profileID.\n    migrateData: async (lc, sql) => {\n      lc.info?.('Backfilling instance.profileIDs');\n      await sql`\n        UPDATE ${sql(schema)}.instances\n        SET \"profileID\" = 'cg' || \"clientGroupID\"\n        WHERE \"profileID\" IS NULL\n      `;\n    },\n  };\n\n  const schemaVersionMigrationMap: IncrementalMigrationMap = {\n    2: migrateV1toV2,\n    3: migrateV2ToV3,\n    4: migrateV3ToV4,\n    // v5 enables asynchronous row-record flushing, and thus relies on\n    // the logic that updates and checks the rowsVersion table in v3.\n    5: {minSafeVersion: 3},\n    6: migrateV5ToV6,\n    7: migrateV6ToV7,\n    8: migrateV7ToV8,\n    9: migrateV8ToV9,\n    // v10 adds queryName and queryArgs to the queries table to support\n    // custom queries. clientAST is now optional to support migrating\n    // off client queries.\n    10: migrateV9ToV10,\n    // V11 removes the deprecated queries.\"expiresAt\", clients.\"patchVersion\",\n    // clients.\"deleted\" columns.\n    11: migrateV10ToV11,\n    12: migratedV11ToV12,\n    // V13 adds instances.\"ttlClock\"\n    13: migratedV12ToV13,\n    // V14 adds an index on instances.\"lastActive\" and a FK constraint\n    // from rows.\"clientGroupID\" to rowsVersion.\"clientGroupID\" for\n    // garbage collection\n    14: migratedV13ToV14,\n    // V15 adds desires.\"inactivatedAtTTLClock\" to store TTLClock values\n    // directly as DOUBLE PRECISION, avoiding postgres.js TIMESTAMPTZ\n    // type conversion issues\n    15: migratedV14ToV15,\n    // V16 adds instances.\"profileID\" and a corresponding index for estimating\n    // active user counts more accurately for apps that use memstore.\n    16: migratedV15ToV16,\n  };\n\n  await runSchemaMigrations(\n    log,\n    'view-syncer',\n    cvrSchema(shard),\n    db,\n    setupMigration,\n    schemaVersionMigrationMap,\n  );\n}\n"],"names":[],"mappings":"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"}

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

@@ -483,7 +483,7 @@ export declare const patchSchema: v.ObjectType<{
 export declare const putRowPatchSchema: v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op" | "rowVersion"> & {
+}, "type" | "op" | "id" | "rowVersion"> & {
     type: v.Type<"row">;
     op: v.Type<"put">;
     id: v.ObjectType<{
@@ -497,7 +497,7 @@ export type PutRowPatch = v.Infer<typeof putRowPatchSchema>;
 export declare const delRowPatchSchema: v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op"> & {
+}, "type" | "op" | "id"> & {
     type: v.Type<"row">;
     op: v.Type<"del">;
     id: v.ObjectType<{
@@ -510,7 +510,7 @@ export type DelRowPatch = v.Infer<typeof delRowPatchSchema>;
 export declare const rowPatchSchema: v.UnionType<[v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op" | "rowVersion"> & {
+}, "type" | "op" | "id" | "rowVersion"> & {
     type: v.Type<"row">;
     op: v.Type<"put">;
     id: v.ObjectType<{
@@ -522,7 +522,7 @@ export declare const rowPatchSchema: v.UnionType<[v.ObjectType<Omit<{
 }, undefined>, v.ObjectType<Omit<{
     type: v.Type<"row" | "query">;
     op: v.Type<"put" | "del">;
-}, "type" | "id" | "op"> & {
+}, "type" | "op" | "id"> & {
     type: v.Type<"row">;
     op: v.Type<"del">;
     id: v.ObjectType<{