resplite 1.4.18 → 1.4.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resplite",
-  "version": "1.4.18",
+  "version": "1.4.20",
   "description": "A RESP2 server with practical Redis compatibility, backed by SQLite",
   "type": "module",
   "main": "src/index.js",

package/src/storage/sqlite/search.js

@@ -72,11 +72,17 @@ function deleteFtsRow(db, ftsTableName, ftsRowid, fieldNames, fields) {
  * Allocate a monotonic FTS rowid that is never reused, even after deletes.
  * This prevents legacy stale tokens from being remapped to a new document.
  * @param {import('better-sqlite3').Database} db
+ * @param {string} docmapTableName
  * @returns {number}
  */
-function allocateFtsRowid(db) {
-  const info = db.prepare('INSERT INTO search_rowid_allocator DEFAULT VALUES').run();
-  return Number(info.lastInsertRowid);
+function allocateFtsRowid(db, docmapTableName) {
+  const maxDocmapRowid = db
+    .prepare(`SELECT COALESCE(MAX(fts_rowid), 0) AS m FROM ${docmapTableName}`)
+    .get().m;
+  const maxAllocated = db.prepare('SELECT COALESCE(MAX(id), 0) AS m FROM search_rowid_allocator').get().m;
+  const nextRowid = Math.max(maxDocmapRowid, maxAllocated) + 1;
+  db.prepare('INSERT INTO search_rowid_allocator(id) VALUES (?)').run(nextRowid);
+  return nextRowid;
 }
 
 /**
@@ -206,7 +212,7 @@ export function addDocument(db, idx, docId, score, replace, fields) {
     if (existing) {
       if (!replace) throw new Error('ERR document exists');
       const previousRowid = existing.fts_rowid;
-      ftsRowid = allocateFtsRowid(db);
+      ftsRowid = allocateFtsRowid(db, docmapT);
       db.prepare(`UPDATE ${docmapT} SET fts_rowid = ? WHERE doc_id = ?`).run(ftsRowid, docId);
       const oldDoc = db.prepare(`SELECT fields_json FROM ${docsT} WHERE doc_id = ?`).get(docId);
       if (oldDoc?.fields_json) {
@@ -214,7 +220,7 @@ export function addDocument(db, idx, docId, score, replace, fields) {
         deleteFtsRow(db, ftsT, previousRowid, fieldNames, oldFields);
       }
     } else {
-      ftsRowid = allocateFtsRowid(db);
+      ftsRowid = allocateFtsRowid(db, docmapT);
       db.prepare(`INSERT INTO ${docmapT}(doc_id, fts_rowid) VALUES (?, ?)`).run(docId, ftsRowid);
     }
 

package/test/unit/search.test.js

@@ -113,6 +113,26 @@ describe('Search layer', () => {
     assert.equal(search(db, 'legacy_stale', 'bicho*', { noContent: true }).total, 0);
   });
 
+  it('allocator seeds above existing docmap rowids on legacy databases', () => {
+    createIndex(db, 'legacy_seed', [{ name: 'payload', type: 'TEXT' }]);
+    const docsT = 'search_docs__legacy_seed';
+    const docmapT = 'search_docmap__legacy_seed';
+    const ftsT = 'search_fts__legacy_seed';
+    const now = Date.now();
+
+    db.prepare(
+      `INSERT INTO ${docsT}(doc_id, score, fields_json, created_at, updated_at) VALUES (?, ?, ?, ?, ?)`
+    ).run('old-doc', 1, JSON.stringify({ payload: 'legacy payload' }), now, now);
+    db.prepare(`INSERT INTO ${docmapT}(doc_id, fts_rowid) VALUES (?, ?)`).run('old-doc', 42);
+    db.prepare(`INSERT INTO ${ftsT}(rowid, payload) VALUES (?, ?)`).run(42, 'legacy payload');
+
+    addDocument(db, 'legacy_seed', 'new-doc', 1, true, { payload: 'fresh payload' });
+
+    const newMap = db.prepare(`SELECT fts_rowid FROM ${docmapT} WHERE doc_id = ?`).get('new-doc');
+    assert.ok(newMap.fts_rowid > 42);
+    assert.equal(search(db, 'legacy_seed', 'fresh*', { noContent: true }).total, 1);
+  });
+
   it('search with NOCONTENT returns total and doc ids', () => {
     const r = search(db, 'names', 'hello', { noContent: true, offset: 0, count: 10 });
     assert.equal(typeof r.total, 'number');