@rotorsoft/act-pg 1.13.7 → 1.13.9

package/dist/index.js

@@ -409,7 +409,7 @@ var PostgresStore = class {
       if (typeof after !== "undefined") {
         values.push(after);
         conditions.push(`id>$${values.length}`);
-      } else if (with_snaps && query.stream_exact && stream) {
+      } else if (with_snaps && query.stream_exact && stream && query.created_before === void 0 && query.created_after === void 0) {
         values.push(stream);
         conditions.push(
           `id >= (SELECT COALESCE(MAX(id), -1) FROM ${this._fqt} WHERE stream=$${values.length} AND name='${SNAP_EVENT}')`
@@ -577,8 +577,9 @@ var PostgresStore = class {
     const client = await this._client("claim");
     try {
       await client.query("BEGIN");
-      const lane_clause = lane !== void 0 ? `AND s.lane = $5` : "";
-      const params = lane !== void 0 ? [lagging, leading, by, millis, lane] : [lagging, leading, by, millis];
+      const lane_clause = lane !== void 0 ? `AND s.lane = $6` : "";
+      const fair = lagging >= 2 ? Math.max(1, Math.floor(lagging / 4)) : 0;
+      const params = lane !== void 0 ? [lagging, leading, by, millis, fair, lane] : [lagging, leading, by, millis, fair];
       const { rows } = await client.query(
         `
         WITH
@@ -615,11 +616,33 @@ var PostgresStore = class {
         -- lagging-watermark order. With everyone at priority=0 the
         -- ORDER BY collapses to plain at ASC so existing workloads
         -- see no behavior change.
+        --
+        -- The lagging frontier is a UNION of two portions (ACT-1223): the
+        -- priority-ordered portion takes the first (lagging - fair) slots
+        -- by priority DESC, at ASC; a fairness reserve then fills fair more
+        -- slots by pure at ASC (priority ignored), excluding the ones
+        -- already chosen, so a default-priority lagging stream is never
+        -- starved out by sustained higher-priority load. With all
+        -- priorities equal both portions order by at, a no-op merge.
         lag AS (
-          SELECT stream, source, at, lane, TRUE AS lagging
-          FROM available
-          ORDER BY priority DESC, at ASC
-          LIMIT $1
+          (
+            SELECT stream, source, at, lane, TRUE AS lagging
+            FROM available
+            ORDER BY priority DESC, at ASC
+            LIMIT ($1::int - $5::int)
+          )
+          UNION
+          (
+            SELECT stream, source, at, lane, TRUE AS lagging
+            FROM available
+            WHERE stream NOT IN (
+              SELECT stream FROM available
+              ORDER BY priority DESC, at ASC
+              LIMIT ($1::int - $5::int)
+            )
+            ORDER BY at ASC
+            LIMIT $5
+          )
         ),
         lead AS (
           SELECT stream, source, at, lane, FALSE AS lagging