remove extra sorting

latticexyz · Dec 1, 2023 · f1886bc · f1886bc
1 parent 8726177
commit f1886bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/store-indexer/src/postgres/getLogs.ts b/packages/store-indexer/src/postgres/getLogs.ts
@@ -55,10 +55,8 @@ export async function getLogs(
     .from(tables.recordsTable)
     .where(or(...conditions))
     .orderBy(
-      asc(tables.recordsTable.lastUpdatedBlockNumber),
-      // TODO: add logIndex and use that to sort instead of address/tableId? (https://github.com/latticexyz/mud/issues/1979)
-      asc(tables.recordsTable.address),
-      asc(tables.recordsTable.tableId)
+      asc(tables.recordsTable.lastUpdatedBlockNumber)
+      // TODO: add logIndex (https://github.com/latticexyz/mud/issues/1979)
     );
 
   const blockNumber = records.reduce(

diff --git a/packages/store-indexer/src/sqlite/getTablesWithRecords.ts b/packages/store-indexer/src/sqlite/getTablesWithRecords.ts
@@ -43,7 +43,10 @@ export function getTablesWithRecords(
       .select()
       .from(sqliteTable)
       .where(eq(sqliteTable.__isDeleted, false))
-      .orderBy(asc(sqliteTable.__lastUpdatedBlockNumber))
+      .orderBy(
+        asc(sqliteTable.__lastUpdatedBlockNumber)
+        // TODO: add logIndex (https://github.com/latticexyz/mud/issues/1979)
+      )
       .all();
     const filteredRecords = !filters.length
       ? records

diff --git a/packages/store-sync/src/sqlite/getTables.ts b/packages/store-sync/src/sqlite/getTables.ts
@@ -15,8 +15,10 @@ export function getTables(
     .select()
     .from(mudStoreTables)
     .where(ids.length ? inArray(mudStoreTables.id, ids) : undefined)
-    // TODO: add logIndex and use that to sort instead of address/tableId? (https://github.com/latticexyz/mud/issues/1979)
-    .orderBy(asc(mudStoreTables.lastUpdatedBlockNumber), asc(mudStoreTables.address), asc(mudStoreTables.tableId))
+    .orderBy(
+      asc(mudStoreTables.lastUpdatedBlockNumber)
+      // TODO: add logIndex (https://github.com/latticexyz/mud/issues/1979)
+    )
     .all();
 
   return tables;