zerobucket 0.11.1 → 0.12.0

package/dist/index.d.cts

@@ -162,9 +162,13 @@ declare class PostgresBackend implements StorageBackend {
      * re-running is safe (already-migrated ids are skipped and reported, not an error). Classic rows
      * already tiered to object storage are refused up front with a clear message (their bytes are
      * not in the database to copy) unless `skipTiered: true`, which skips and counts them instead.
-     * Still all-or-nothing: one transaction.
+     * Still all-or-nothing: one transaction, under an advisory lock (the Python package takes the same
+     * one since 0.34.0, so a Node and a Python migration of one database exclude each other).
+     * Both `created_at` and `updated_at` are kept exactly (before 0.12.0 `updated_at` became the time of
+     * the migration), and one `migrate_to_dedup` event is reported to `onOperation` (before 0.12.0, none).
      */
     migrateClassicToDedup(opts?: MigrateToDedupOptions): Promise<MigrateToDedupResult>;
+    private migrateClassicToDedupInner;
     private hydrate;
     /**
      * Remove tiered objects AFTER their rows are gone. Ordering is deliberate:

package/dist/index.d.ts

@@ -162,9 +162,13 @@ declare class PostgresBackend implements StorageBackend {
      * re-running is safe (already-migrated ids are skipped and reported, not an error). Classic rows
      * already tiered to object storage are refused up front with a clear message (their bytes are
      * not in the database to copy) unless `skipTiered: true`, which skips and counts them instead.
-     * Still all-or-nothing: one transaction.
+     * Still all-or-nothing: one transaction, under an advisory lock (the Python package takes the same
+     * one since 0.34.0, so a Node and a Python migration of one database exclude each other).
+     * Both `created_at` and `updated_at` are kept exactly (before 0.12.0 `updated_at` became the time of
+     * the migration), and one `migrate_to_dedup` event is reported to `onOperation` (before 0.12.0, none).
      */
     migrateClassicToDedup(opts?: MigrateToDedupOptions): Promise<MigrateToDedupResult>;
+    private migrateClassicToDedupInner;
     private hydrate;
     /**
      * Remove tiered objects AFTER their rows are gone. Ordering is deliberate:

package/dist/index.js

@@ -879,7 +879,10 @@ var PostgresBackend = class {
    * re-running is safe (already-migrated ids are skipped and reported, not an error). Classic rows
    * already tiered to object storage are refused up front with a clear message (their bytes are
    * not in the database to copy) unless `skipTiered: true`, which skips and counts them instead.
-   * Still all-or-nothing: one transaction.
+   * Still all-or-nothing: one transaction, under an advisory lock (the Python package takes the same
+   * one since 0.34.0, so a Node and a Python migration of one database exclude each other).
+   * Both `created_at` and `updated_at` are kept exactly (before 0.12.0 `updated_at` became the time of
+   * the migration), and one `migrate_to_dedup` event is reported to `onOperation` (before 0.12.0, none).
    */
   async migrateClassicToDedup(opts = {}) {
     if (!this.dedup) {
@@ -887,6 +890,17 @@ var PostgresBackend = class {
         "migrateClassicToDedup() must be called on an instance created with dedup: true."
       );
     }
+    const start = performance.now();
+    try {
+      const result = await this.migrateClassicToDedupInner(opts);
+      this.emit("migrate_to_dedup", start, true, null, 0);
+      return result;
+    } catch (exc) {
+      this.emit("migrate_to_dedup", start, false, msg(exc), 0);
+      throw exc;
+    }
+  }
+  async migrateClassicToDedupInner(opts) {
     await this.ready();
     const client = await this.pool.connect();
     let destroy = false;
@@ -923,11 +937,11 @@ var PostgresBackend = class {
       const BATCH = 20;
       for (; ; ) {
         const page = cursor ? await client.query(
-          `SELECT id, data, mime_type, original_filename, size_bytes, width, height, checksum_sha256, created_at::text AS created_at_txt
+          `SELECT id, data, mime_type, original_filename, size_bytes, width, height, checksum_sha256, created_at::text AS created_at_txt, updated_at::text AS updated_at_txt
                FROM zerobucket_images WHERE (created_at, id) > ($1::timestamptz, $2::uuid)${onlyInDb ? " AND storage_backend = 'postgres'" : ""} ORDER BY created_at, id LIMIT ${BATCH}`,
           [cursor.createdAt, cursor.id]
         ) : await client.query(
-          `SELECT id, data, mime_type, original_filename, size_bytes, width, height, checksum_sha256, created_at::text AS created_at_txt
+          `SELECT id, data, mime_type, original_filename, size_bytes, width, height, checksum_sha256, created_at::text AS created_at_txt, updated_at::text AS updated_at_txt
                FROM zerobucket_images${onlyInDb ? " WHERE storage_backend = 'postgres'" : ""} ORDER BY created_at, id LIMIT ${BATCH}`
         );
         if (page.rows.length === 0) break;
@@ -966,8 +980,14 @@ var PostgresBackend = class {
         }
         for (const r of fresh) {
           await client.query(
-            "INSERT INTO zerobucket_image_refs (id, checksum_sha256, original_filename, created_at) VALUES ($1, $2, $3, $4::timestamptz)",
-            [r.id, r.checksum_sha256, r.original_filename, r.created_at_txt]
+            "INSERT INTO zerobucket_image_refs (id, checksum_sha256, original_filename, created_at, updated_at) VALUES ($1, $2, $3, $4::timestamptz, $5::timestamptz)",
+            [
+              r.id,
+              r.checksum_sha256,
+              r.original_filename,
+              r.created_at_txt,
+              r.updated_at_txt
+            ]
           );
           seen.add(r.checksum_sha256);
           migrated += 1;