fix(cu): select cached messages with correct seq where clause

permaweb · Jan 7, 2025 · 44fee3b · 44fee3b
1 parent 859af1e
commit 44fee3b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/servers/cu/src/effects/ao-evaluation.js b/servers/cu/src/effects/ao-evaluation.js
@@ -252,14 +252,23 @@ export function findMessageBeforeWith ({ db }) {
         FROM ${MESSAGES_TABLE}
         WHERE
           id = ?
-          AND "processId" = ?
-          AND seq < ?
+          AND processId = ?
+          AND (
+            CAST(substr(seq, instr(seq, ':') + 1) as UNSIGNED) < ?
+            OR
+              (
+                CAST(SUBSTR(seq, 1, INSTR(seq, ':') - 1) AS INTEGER) = ?
+                AND CAST(SUBSTR(seq, INSTR(seq, ':') + 1) AS INTEGER) < ?
+              )
+          )
         LIMIT 1;
       `,
       parameters: [
         createMessageId({ messageId, deepHash, isAssignment }),
         processId,
-        `${epoch}:${nonce}` // 0:13
+        epoch,
+        epoch,
+        nonce
       ]
     }
   }

diff --git a/servers/cu/src/effects/ao-evaluation.test.js b/servers/cu/src/effects/ao-evaluation.test.js
@@ -382,7 +382,9 @@ describe('ao-evaluation', () => {
               assert.deepStrictEqual(parameters, [
                 'deepHash-123',
                 'process-123',
-                '0:3'
+                0,
+                0,
+                3
               ])
 
               const mockAssigment = {
@@ -418,7 +420,9 @@ describe('ao-evaluation', () => {
                 assert.deepStrictEqual(parameters, [
                   'message-123',
                   'process-123',
-                  '0:3'
+                  0,
+                  0,
+                  3
                 ])
 
                 const mockAssigment = {
@@ -453,7 +457,9 @@ describe('ao-evaluation', () => {
                 assert.deepStrictEqual(parameters, [
                   'message-123',
                   'process-123',
-                  '0:3'
+                  0,
+                  0,
+                  3
                 ])
 
                 const mockAssigment = {