feat(store-sync): key decoded records by last updated block number

latticexyz · Jan 5, 2024 · 40c4fd8 · 40c4fd8
1 parent f6f4028
commit 40c4fd8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/store-sync/src/postgres-decoded/buildTable.ts b/packages/store-sync/src/postgres-decoded/buildTable.ts
@@ -8,7 +8,7 @@ import { buildColumn } from "./buildColumn";
 
 export const metaColumns = {
   __keyBytes: asHex("__key_bytes").primaryKey(),
-  __lastUpdatedBlockNumber: asBigInt("__last_updated_block_number", "numeric"),
+  __lastUpdatedBlockNumber: asBigInt("__last_updated_block_number", "numeric").primaryKey(),
 } as const satisfies Record<string, PgColumnBuilderBase>;
 
 type PgTableFromSchema<TKeySchema extends KeySchema, TValueSchema extends ValueSchema> = PgTableWithColumns<{

diff --git a/packages/store-sync/src/postgres-decoded/createStorageAdapter.ts b/packages/store-sync/src/postgres-decoded/createStorageAdapter.ts
@@ -80,7 +80,8 @@ export async function createStorageAdapter<TConfig extends StoreConfig = StoreCo
               and(
                 eq(internalTables.recordsTable.address, log.address),
                 eq(internalTables.recordsTable.tableId, log.args.tableId),
-                eq(internalTables.recordsTable.keyBytes, keyBytes)
+                eq(internalTables.recordsTable.keyBytes, keyBytes),
+                eq(internalTables.recordsTable.blockNumber, blockNumber)
               )
             )
             .limit(1)
@@ -114,7 +115,7 @@ export async function createStorageAdapter<TConfig extends StoreConfig = StoreCo
               ...value,
             })
             .onConflictDoUpdate({
-              target: sqlTable.__keyBytes,
+              target: [sqlTable.__keyBytes, sqlTable.__lastUpdatedBlockNumber],
               set: {
                 __lastUpdatedBlockNumber: blockNumber,
                 ...value,
@@ -128,7 +129,10 @@ export async function createStorageAdapter<TConfig extends StoreConfig = StoreCo
             key,
           });
 
-          await tx.delete(sqlTable).where(eq(sqlTable.__keyBytes, keyBytes)).execute();
+          await tx
+            .delete(sqlTable)
+            .where(and(eq(sqlTable.__keyBytes, keyBytes), eq(sqlTable.__lastUpdatedBlockNumber, blockNumber)))
+            .execute();
         }
       }
     });