@rotorsoft/act-pg 1.15.0 → 1.16.1

package/dist/index.js

@@ -852,36 +852,19 @@ var PostgresStore = class {
         await client.query(
           `
           UPDATE ${this._fqs} t
-          SET priority = COALESCE((s->>'priority')::int, 0)
+          SET priority = GREATEST(t.priority, COALESCE((s->>'priority')::int, 0)),
+              lane = COALESCE(s->>'lane', 'default'),
+              correlated_at = GREATEST(t.correlated_at, (s->>'correlated_at')::int)
           FROM jsonb_array_elements($1::jsonb) AS s
           WHERE t.stream = s->>'stream'
-            AND COALESCE((s->>'priority')::int, 0) > t.priority
+            AND (COALESCE((s->>'priority')::int, 0) > t.priority
+                 OR t.lane <> COALESCE(s->>'lane', 'default')
+                 OR (s->>'correlated_at' IS NOT NULL
+                     AND (t.correlated_at IS NULL
+                          OR t.correlated_at < (s->>'correlated_at')::int)))
           `,
           [JSON.stringify(streams)]
         );
-        await client.query(
-          `
-          UPDATE ${this._fqs} t
-          SET lane = COALESCE(s->>'lane', 'default')
-          FROM jsonb_array_elements($1::jsonb) AS s
-          WHERE t.stream = s->>'stream'
-            AND t.lane <> COALESCE(s->>'lane', 'default')
-          `,
-          [JSON.stringify(streams)]
-        );
-        if (streams.some((s) => s.correlated_at !== void 0))
-          await client.query(
-            `
-          UPDATE ${this._fqs} t
-          SET correlated_at = (s->>'correlated_at')::int
-          FROM jsonb_array_elements($1::jsonb) AS s
-          WHERE t.stream = s->>'stream'
-            AND s->>'correlated_at' IS NOT NULL
-            AND (t.correlated_at IS NULL
-                 OR t.correlated_at < (s->>'correlated_at')::int)
-          `,
-            [JSON.stringify(streams)]
-          );
       }
       if (correlated_at !== void 0)
         await client.query(
@@ -1187,7 +1170,7 @@ var PostgresStore = class {
       values.push(query.after);
       conditions.push(`stream > $${values.length}`);
     }
-    let sql = `SELECT stream, source, at, retry, blocked, error, leased_by, leased_until, priority, lane, deferred_at FROM ${this._fqs}`;
+    let sql = `SELECT stream, source, at, retry, blocked, error, leased_by, leased_until, priority, lane, deferred_at, correlated_at FROM ${this._fqs}`;
     if (conditions.length) sql += " WHERE " + conditions.join(" AND ");
     values.push(limit);
     sql += ` ORDER BY stream LIMIT $${values.length}`;
@@ -1214,7 +1197,9 @@ var PostgresStore = class {
           lane: row.lane,
           // Persisted as timestamptz; surface as ms since epoch (#1221) so
           // the cold-start re-seed can re-arm the drain at the due-time.
-          deferred_at: row.deferred_at ? row.deferred_at.getTime() : void 0
+          deferred_at: row.deferred_at ? row.deferred_at.getTime() : void 0,
+          // NULL means "no mark yet" — unknown, not "no work" (#1485).
+          correlated_at: row.correlated_at ?? void 0
         });
         count++;
       }