Add back in main isDeleted code

ponder-sh · Dec 12, 2023 · 5bb2ca1 · 5bb2ca1
1 parent f143489
commit 5bb2ca1
Showing 1 changed file with 24 additions and 33 deletions.
diff --git a/packages/core/src/indexing-store/postgres/store.ts b/packages/core/src/indexing-store/postgres/store.ts
@@ -771,48 +771,39 @@ export class PostgresIndexingStore implements IndexingStore {
         encodeBigInts: false,
       });
       const encodedCheckpoint = encodeCheckpoint(checkpoint);
+      const isDeleted = await this.db.transaction().execute(async (tx) => {
+        // If the latest version has effectiveFromCheckpoint equal to current checkpoint,
+        // this row was created within the same indexing function, and we can delete it.
+        let deletedRow = await tx
+          .deleteFrom(table)
+          .where(
+            "id",
+            this.idColumnComparator({ tableName, schema: this.schema }),
+            formattedId,
+          )
+          .where("effectiveFromCheckpoint", "=", encodedCheckpoint)
+          .where("effectiveToCheckpoint", "=", "latest")
+          .returning(["id"])
+          .executeTakeFirst();
 
-      const isDeleted = await this.writerDB
-        .transaction()
-        .execute(async (tx) => {
-          // If the latest version has effectiveFromCheckpoint equal to current checkpoint,
-          // this row was created within the same indexing function, and we can delete it.
-          let deletedRow = await tx
-            .deleteFrom(table)
+        // If we did not take the shortcut above, update the latest record
+        // setting effectiveToCheckpoint to the current checkpoint.
+        if (!deletedRow) {
+          deletedRow = await tx
+            .updateTable(table)
+            .set({ effectiveToCheckpoint: encodedCheckpoint })
             .where(
               "id",
-              this.idColumnComparator({
-                tableName,
-                schema: this.schema,
-              }),
+              this.idColumnComparator({ tableName, schema: this.schema }),
               formattedId,
             )
-            .where("effectiveFromCheckpoint", "=", encodedCheckpoint)
             .where("effectiveToCheckpoint", "=", "latest")
             .returning(["id"])
             .executeTakeFirst();
+        }
 
-          // If we did not take the shortcut above, update the latest record
-          // setting effectiveToCheckpoint to the current checkpoint.
-          if (!deletedRow) {
-            deletedRow = await tx
-              .updateTable(table)
-              .set({ effectiveToCheckpoint: encodedCheckpoint })
-              .where(
-                "id",
-                this.idColumnComparator({
-                  tableName,
-                  schema: this.schema,
-                }),
-                formattedId,
-              )
-              .where("effectiveToCheckpoint", "=", "latest")
-              .returning(["id"])
-              .executeTakeFirst();
-          }
-
-          return !!deletedRow;
-        });
+        return !!deletedRow;
+      });
 
       return isDeleted;
     });