@secondlayer/subgraphs 3.26.0 → 3.26.2

package/dist/src/runtime/reorg.js

@@ -605,14 +605,10 @@ class SubgraphContext {
     this.ops.length = 0;
     const statements = this.buildStatements(opsToFlush);
     if ("isTransaction" in this.db) {
-      for (const stmt of statements) {
-        await sql.raw(stmt).execute(this.db);
-      }
+      await this.execStatements(this.db, statements);
     } else {
       await this.db.transaction().execute(async (tx) => {
-        for (const stmt of statements) {
-          await sql.raw(stmt).execute(tx);
-        }
+        await this.execStatements(tx, statements);
       });
     }
     const writes = opsToFlush.map((op, rowIndex) => {
@@ -631,6 +627,25 @@ class SubgraphContext {
     });
     return { count: opsToFlush.length, writes };
   }
+  async execStatements(executor, statements) {
+    const affected = (r) => r.numAffectedRows ?? 0n;
+    for (const stmt of statements) {
+      if (typeof stmt === "string") {
+        await sql.raw(stmt).execute(executor);
+        continue;
+      }
+      const updated = await sql.raw(stmt.update).execute(executor);
+      if (affected(updated) > 0n)
+        continue;
+      const inserted = await sql.raw(stmt.insert).execute(executor);
+      if (affected(inserted) > 0n)
+        continue;
+      const retried = await sql.raw(stmt.update).execute(executor);
+      if (affected(retried) === 0n) {
+        throw new Error(`increment could not be applied to ${this.pgSchemaName}.${stmt.table} where ${stmt.keyPred}: row neither updated nor inserted`);
+      }
+    }
+  }
   prepareInsert(op) {
     const upsertKeys = op.data._upsert_keys;
     const data = { ...op.data };
@@ -710,7 +725,6 @@ class SubgraphContext {
       for (const r of batch.rows.values()) {
         const keyPred = batch.keyCols.map((k) => `"${k}" = ${escapeLiteral(r.keys[k])}`).join(" AND ");
         const updSet = batch.deltaCols.map((c) => `"${c}" = COALESCE("${c}", 0) + (${String(r.deltas[c] ?? 0n)})`).join(", ");
-        statements.push(`UPDATE ${qualifiedTable} SET ${updSet} WHERE ${keyPred}`);
         const insertVals = [
           ...batch.keyCols.map((k) => escapeLiteral(r.keys[k])),
           ...batch.deltaCols.map((c) => String(r.deltas[c] ?? 0n)),
@@ -718,7 +732,13 @@ class SubgraphContext {
           escapeLiteral(r.meta.txId),
           "NOW()"
         ];
-        statements.push(`INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) ` + `SELECT ${insertVals.join(", ")} ` + `WHERE NOT EXISTS (SELECT 1 FROM ${qualifiedTable} WHERE ${keyPred})`);
+        statements.push({
+          kind: "increment",
+          table: batch.table,
+          keyPred,
+          update: `UPDATE ${qualifiedTable} SET ${updSet} WHERE ${keyPred}`,
+          insert: `INSERT INTO ${qualifiedTable} (${cols.map((c) => `"${c}"`).join(", ")}) ` + `SELECT ${insertVals.join(", ")} ` + `WHERE NOT EXISTS (SELECT 1 FROM ${qualifiedTable} WHERE ${keyPred})`
+        });
       }
       incBatch = null;
       incBatchKey = "";
@@ -3025,7 +3045,7 @@ class StatsAccumulator {
 }
 
 // src/runtime/catchup.ts
-import { getTargetDb as getTargetDb2 } from "@secondlayer/shared/db";
+import { getTargetDb as getTargetDb2, sql as sql4 } from "@secondlayer/shared/db";
 import { getSubgraph } from "@secondlayer/shared/db/queries/subgraphs";
 import { logger as logger8 } from "@secondlayer/shared/logger";
 
@@ -3096,6 +3116,15 @@ async function withSubgraphBlockLock(name, fn) {
     release();
   }
 }
+async function withSubgraphBlockAdvisoryLock(name, fn) {
+  return getTargetDb2().transaction().execute(async (lockTx) => {
+    await sql4`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-block:${name}`}))`.execute(lockTx);
+    return fn();
+  });
+}
+async function withSubgraphBlockWriteLock(name, fn) {
+  return withSubgraphBlockLock(name, () => withSubgraphBlockAdvisoryLock(name, fn));
+}
 function bumpReorgEpoch(name) {
   reorgEpoch.set(name, (reorgEpoch.get(name) ?? 0) + 1);
 }
@@ -3224,7 +3253,7 @@ async function catchUpSubgraph(subgraph, subgraphName) {
         const preloaded = blockData;
         let result;
         try {
-          result = await withSubgraphBlockLock(subgraphName, async () => {
+          result = await withSubgraphBlockWriteLock(subgraphName, async () => {
             if (getReorgEpoch(subgraphName) !== walkEpoch) {
               throw new ReorgEpochChangedError(subgraphName);
             }
@@ -3292,7 +3321,7 @@ import {
   resolveSubgraphRawClient
 } from "@secondlayer/shared/db/queries/subgraphs";
 import { logger as logger9 } from "@secondlayer/shared/logger";
-import { sql as sql4 } from "kysely";
+import { sql as sql5 } from "kysely";
 async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
   const targetDb = getTargetDb3();
   const activeSubgraphs = (await listSubgraphs(targetDb)).filter((v) => v.status === "active");
@@ -3310,7 +3339,7 @@ async function handleSubgraphReorg(blockHeight, loadSubgraphDef) {
       bumpReorgEpoch(sg.name);
       await withSubgraphBlockLock(sg.name, async () => {
         await getTargetDb3().transaction().execute(async (lockTx) => {
-          await sql4`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-reorg:${sg.name}`}))`.execute(lockTx);
+          await sql5`SELECT pg_advisory_xact_lock(hashtext(${`subgraph-reorg:${sg.name}`}))`.execute(lockTx);
           await reorgOneSubgraph(sg, schema, blockHeight, loadSubgraphDef);
         });
       });
@@ -3421,5 +3450,5 @@ export {
   handleSubgraphReorg
 };
 
-//# debugId=239939327C1D8BE064756E2164756E21
+//# debugId=902B28BBF3E6B7B064756E2164756E21
 //# sourceMappingURL=reorg.js.map