@rotorsoft/act-pg 1.13.19 → 1.15.0

package/dist/index.js

@@ -84,6 +84,8 @@ var PostgresStore = class {
   config;
   _fqt;
   _fqs;
+  /** Correlate checkpoint table (#1484) — one row, id 0. */
+  _fqc;
   /**
    * Per-instance writer identifier embedded in every NOTIFY payload. The
    * `notify()` LISTEN handler skips payloads where `by === this._by`,
@@ -170,6 +172,7 @@ var PostgresStore = class {
     this._pool = new Pool({ ...poolConfig, types: scopedTypes });
     this._fqt = `"${this.config.schema}"."${this.config.table}"`;
     this._fqs = `"${this.config.schema}"."${this.config.table}_streams"`;
+    this._fqc = `"${this.config.schema}"."${this.config.table}_correlated"`;
     this._channel = notify_channel(this.config.schema, this.config.table);
     if (this.config.notify) {
       this.notify = this._subscribe_notifications.bind(this);
@@ -303,9 +306,20 @@ var PostgresStore = class {
           leased_until timestamptz,
           priority int NOT NULL DEFAULT 0,
           lane text NOT NULL DEFAULT 'default',
-          deferred_at timestamptz
+          deferred_at timestamptz,
+          correlated_at int
         ) TABLESPACE pg_default;`
       );
+      await client.query(
+        `CREATE TABLE IF NOT EXISTS ${this._fqc} (
+          id int PRIMARY KEY DEFAULT 0,
+          at int NOT NULL DEFAULT -1,
+          CONSTRAINT ${this.config.table}_correlated_singleton CHECK (id = 0)
+        ) TABLESPACE pg_default;`
+      );
+      await client.query(
+        `INSERT INTO ${this._fqc} (id) VALUES (0) ON CONFLICT (id) DO NOTHING;`
+      );
       await client.query(
         `ALTER TABLE ${this._fqs}
          ADD COLUMN IF NOT EXISTS priority int NOT NULL DEFAULT 0;`
@@ -318,6 +332,10 @@ var PostgresStore = class {
         `ALTER TABLE ${this._fqs}
          ADD COLUMN IF NOT EXISTS deferred_at timestamptz;`
       );
+      await client.query(
+        `ALTER TABLE ${this._fqs}
+         ADD COLUMN IF NOT EXISTS correlated_at int;`
+      );
       await client.query(
         `DO $$
          BEGIN
@@ -366,6 +384,11 @@ var PostgresStore = class {
         `CREATE INDEX IF NOT EXISTS "${this.config.table}_streams_lane_ix"
         ON ${this._fqs} (lane);`
       );
+      await client.query(
+        `CREATE INDEX IF NOT EXISTS "${this.config.table}_streams_correlated_at_ix"
+        ON ${this._fqs} (lane, priority DESC, at)
+        WHERE blocked = false AND at < correlated_at;`
+      );
       await client.query("COMMIT");
       logger.info(
         `Seeded schema "${this.config.schema}" with table "${this.config.table}"`
@@ -391,7 +414,7 @@ var PostgresStore = class {
           WHERE schema_name = '${this.config.schema}'
         ) THEN
           EXECUTE 'DROP TABLE IF EXISTS ${this._fqt}';
-          EXECUTE 'DROP TABLE IF EXISTS ${this._fqs}';
+          EXECUTE 'DROP TABLE IF EXISTS ${this._fqc}, ${this._fqs}';
           IF '${this.config.schema}' <> 'public' THEN
             EXECUTE 'DROP SCHEMA "${this.config.schema}" CASCADE';
           END IF;
@@ -642,7 +665,7 @@ var PostgresStore = class {
         -- Measured at 10k subscribed streams with 10 pending: 5,792 ms
         -- before, 10.3 ms after. See libs/act-pg/PERFORMANCE.md for #1448.
         eligible AS (
-          SELECT stream, source, at, priority, lane
+          SELECT stream, source, at, priority, lane, correlated_at
           FROM ${this._fqs} s
           WHERE blocked = false
             ${lane_clause}
@@ -650,6 +673,26 @@ var PostgresStore = class {
             AND (deferred_at IS NULL OR deferred_at <= NOW())
         ),
         available AS (
+          -- Fast arm (#1485): a marked stream answers from the subscription
+          -- row alone. Read from the base table, NOT from the eligible CTE:
+          -- it is referenced several times so PG materializes it, and a
+          -- materialized scan cannot use the partial index this predicate was
+          -- built for (WHERE blocked = false AND at < correlated_at).
+          -- The comparison is NULL-safe: an unmarked row compares
+          -- unknown and is excluded here, falling through to the legacy arms.
+          SELECT stream, source, at, priority, lane
+          FROM ${this._fqs} s
+          WHERE s.blocked = false
+            AND s.at < s.correlated_at
+            ${lane_clause}
+            AND (s.leased_by IS NULL OR s.leased_until <= NOW())
+            AND (s.deferred_at IS NULL OR s.deferred_at <= NOW())
+          UNION ALL
+          -- Legacy arms, gated on an absent mark. NULL means "unknown", so
+          -- an install that predates the column probes the event log exactly
+          -- as it did before, and each row migrates to the fast arm the first
+          -- time correlate marks it. Deleted once correlate marks universally.
+          --
           -- Every arm below is watermark-agnostic (#1446): a fresh
           -- subscription sits at -1, and e.id > s.at already answers
           -- correctly there, since the first event has a greater id.
@@ -659,7 +702,8 @@ var PostgresStore = class {
           -- Source-less subscription: any non-snapshot event past the
           -- watermark counts, so the id index alone answers it.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.source IS NULL
+          WHERE s.correlated_at IS NULL
+            AND s.source IS NULL
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
               WHERE e.id > s.at AND e.name <> '${SNAP_EVENT}' LIMIT 1
@@ -668,7 +712,8 @@ var PostgresStore = class {
           -- Literal source (no regex metacharacter): exact equality, so
           -- "s1" never claims "s12", and (stream, id) is usable.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.source IS NOT NULL
+          WHERE s.correlated_at IS NULL
+            AND s.source IS NOT NULL
             AND s.source !~ '${SOURCE_METACHARACTER_CLASS}'
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
@@ -681,7 +726,8 @@ var PostgresStore = class {
           -- it anchors. Unavoidably a scan \u2014 but only for the subscriptions
           -- that actually declare a pattern.
           SELECT stream, source, at, priority, lane FROM eligible s
-          WHERE s.source IS NOT NULL
+          WHERE s.correlated_at IS NULL
+            AND s.source IS NOT NULL
             AND s.source ~ '${SOURCE_METACHARACTER_CLASS}'
             AND EXISTS (
               SELECT 1 FROM ${this._fqt} e
@@ -783,7 +829,7 @@ var PostgresStore = class {
    * @param streams - Streams to register with optional source.
    * @returns subscribed count and current max watermark.
    */
-  async subscribe(streams) {
+  async subscribe(streams, correlated_at) {
     const client = await this._client("subscribe");
     try {
       await client.query("BEGIN");
@@ -823,12 +869,35 @@ var PostgresStore = class {
           `,
           [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(
+          `UPDATE ${this._fqc} SET at = GREATEST(at, $1::int) WHERE id = 0`,
+          [correlated_at]
+        );
       const { rows } = await client.query(
-        `SELECT COALESCE(MAX(at), -1) AS max FROM ${this._fqs}`
+        `SELECT (SELECT COALESCE(MAX(at), -1) FROM ${this._fqs}) AS max,
+                (SELECT at FROM ${this._fqc} WHERE id = 0) AS correlated_at`
       );
       await client.query("COMMIT");
-      return { subscribed, watermark: rows[0]?.max ?? -1 };
+      return {
+        subscribed,
+        watermark: rows[0]?.max ?? -1,
+        correlated_at: Number(rows[0]?.correlated_at ?? -1)
+      };
     } catch (error) {
       await client.query("ROLLBACK").catch(() => {
       });