fix(memory): key index sources by path and source · openc...

Recent Commits to openclaw:main

jalehman · 2026-06-19 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ describe("memory manager database publication", () => {`
`140`	`140`
`141`	`141`	`concurrentDb = new DatabaseSync(targetPath);`
`142`	`142`	`concurrentDb`
`143`		`-.prepare("UPDATE memory_index_sources SET hash = ? WHERE path = ?")`
`144`		`-.run("newer", "memory.md");`
	`143`	`+.prepare("UPDATE memory_index_sources SET hash = ? WHERE path = ? AND source = ?")`
	`144`	`+.run("newer", "memory.md", "memory");`
`145`	`145`	`concurrentDb.close();`
`146`	`146`	`concurrentDb = undefined;`
`147`	`147`
`@@ -154,7 +154,9 @@ describe("memory manager database publication", () => {`
`154`	`154`	`}),`
`155`	`155`	`).rejects.toThrow(/changed while full reindex was building/);`
`156`	`156`	`expect(`
`157`		`-targetDb.prepare("SELECT hash FROM memory_index_sources WHERE path = ?").get("memory.md"),`
	`157`	`+targetDb`
	`158`	`+.prepare("SELECT hash FROM memory_index_sources WHERE path = ? AND source = ?")`
	`159`	`+.get("memory.md", "memory"),`
`158`	`160`	`).toEqual({ hash: "newer" });`
`159`	`161`	`} finally {`
`160`	`162`	`try {`

Original file line number	Diff line number	Diff line change
`@@ -719,8 +719,7 @@ export abstract class MemoryManagerEmbeddingOps extends MemoryManagerSyncOps {`
`719`	`719`	`this.db`
`720`	`720`	`.prepare(`
`721`	`721`	`INSERT INTO memory_index_sources (path, source, hash, mtime, size) VALUES (?, ?, ?, ?, ?)
`722`		`- ON CONFLICT(path) DO UPDATE SET`
`723`		`- source=excluded.source,`
	`722`	`+ ON CONFLICT(path, source) DO UPDATE SET`
`724`	`723`	`hash=excluded.hash,`
`725`	`724`	`mtime=excluded.mtime,`
`726`	`725`	size=excluded.size`,

Original file line number	Diff line number	Diff line change
`@@ -118,11 +118,12 @@ describe("memory manager self-heal missing identity with FTS-only chunks", () =>`
`118`	`118`	`updated_at INTEGER NOT NULL`
`119`	`119`	`);`
`120`	`120`	`CREATE TABLE IF NOT EXISTS memory_index_sources (`
`121`		`- path TEXT PRIMARY KEY,`
	`121`	`+ path TEXT NOT NULL,`
`122`	`122`	`source TEXT NOT NULL DEFAULT 'memory',`
`123`	`123`	`hash TEXT NOT NULL,`
`124`	`124`	`mtime INTEGER NOT NULL,`
`125`		`- size INTEGER NOT NULL`
	`125`	`+ size INTEGER NOT NULL,`
	`126`	`+ PRIMARY KEY (path, source)`
`126`	`127`	`);`
`127`	`128`	`INSERT INTO memory_index_chunks (id, path, source, start_line, end_line, hash, model, text, embedding, updated_at)`
`128`	`129`	`VALUES ('chunk-1', 'MEMORY.md', 'memory', 1, 3, 'hash-1', '${model}', 'Alpha topic keep note', '[]', ${Date.now()});`

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,33 @@ describe("memory index schema", () => {`
`84`	`84`	`}`
`85`	`85`	`});`
`86`	`86`
	`87`	`+it("stores source records with the same path in separate sources", () => {`
	`88`	`+const db = new DatabaseSync(":memory:");`
	`89`	`+try {`
	`90`	`+ensureMemoryIndexSchema({`
	`91`	`+ db,`
	`92`	`+cacheEnabled: false,`
	`93`	`+ftsEnabled: false,`
	`94`	`+});`
	`95`	`+`
	`96`	`+db.prepare(`
	`97`	`+"INSERT INTO memory_index_sources (path, source, hash, mtime, size) VALUES (?, ?, ?, ?, ?)",`
	`98`	`+).run("shared.md", "memory", "memory-hash", 10, 20);`
	`99`	`+db.prepare(`
	`100`	`+"INSERT INTO memory_index_sources (path, source, hash, mtime, size) VALUES (?, ?, ?, ?, ?)",`
	`101`	`+).run("shared.md", "sessions", "session-hash", 30, 40);`
	`102`	`+`
	`103`	`+expect(`
	`104`	`+db.prepare("SELECT path, source, hash FROM memory_index_sources ORDER BY source").all(),`
	`105`	`+).toEqual([`
	`106`	`+{ path: "shared.md", source: "memory", hash: "memory-hash" },`
	`107`	`+{ path: "shared.md", source: "sessions", hash: "session-hash" },`
	`108`	`+]);`
	`109`	`+} finally {`
	`110`	`+db.close();`
	`111`	`+}`
	`112`	`+});`
	`113`	`+`
`87`	`114`	`it("leaves unrelated generic tables untouched", () => {`
`88`	`115`	`const db = new DatabaseSync(":memory:");`
`89`	`116`	`try {`

Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,12 @@ export function ensureMemoryIndexSchema(params: {`
`194`	`194`	`value TEXT NOT NULL`
`195`	`195`	`);`
`196`	`196`	`CREATE TABLE IF NOT EXISTS ${MEMORY_INDEX_SOURCES_TABLE} (`
`197`		`- path TEXT PRIMARY KEY,`
	`197`	`+ path TEXT NOT NULL,`
`198`	`198`	`source TEXT NOT NULL DEFAULT 'memory',`
`199`	`199`	`hash TEXT NOT NULL,`
`200`	`200`	`mtime INTEGER NOT NULL,`
`201`		`- size INTEGER NOT NULL`
	`201`	`+ size INTEGER NOT NULL,`
	`202`	`+ PRIMARY KEY (path, source)`
`202`	`203`	`);`
`203`	`204`	`CREATE TABLE IF NOT EXISTS ${MEMORY_INDEX_CHUNKS_TABLE} (`
`204`	`205`	`id TEXT PRIMARY KEY,`
`@@ -250,6 +251,10 @@ export function ensureMemoryIndexSchema(params: {`
`250`	`251`	`UPDATE ${MEMORY_INDEX_STATE_TABLE} SET revision = revision + 1 WHERE id = 1;`
`251`	`252`	`END;`
`252`	`253`
	`254`	`+ CREATE INDEX IF NOT EXISTS idx_memory_index_sources_source`
	`255`	`+ ON ${MEMORY_INDEX_SOURCES_TABLE}(source);`
	`256`	`+ CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path_source`
	`257`	`+ ON ${MEMORY_INDEX_CHUNKS_TABLE}(path, source);`
`253`	`258`	`CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path`
`254`	`259`	`ON ${MEMORY_INDEX_CHUNKS_TABLE}(path);`
`255`	`260`	`CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_source`

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ export interface MemoryIndexMeta {`
`62`	`62`	`export interface MemoryIndexSources {`
`63`	`63`	`hash: string;`
`64`	`64`	`mtime: number;`
`65`		`-path: string \| null;`
	`65`	`+path: string;`
`66`	`66`	`size: number;`
`67`	`67`	`source: Generated<string>;`
`68`	`68`	`}`

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,12 @@ CREATE TABLE IF NOT EXISTS memory_index_meta (`
`48`	`48`	`);`
`49`	`49`
`50`	`50`	`CREATE TABLE IF NOT EXISTS memory_index_sources (`
`51`		`- path TEXT PRIMARY KEY,`
	`51`	`+ path TEXT NOT NULL,`
`52`	`52`	`source TEXT NOT NULL DEFAULT 'memory',`
`53`	`53`	`hash TEXT NOT NULL,`
`54`	`54`	`mtime INTEGER NOT NULL,`
`55`		`- size INTEGER NOT NULL`
	`55`	`+ size INTEGER NOT NULL,`
	`56`	`+ PRIMARY KEY (path, source)`
`56`	`57`	`);`
`57`	`58`
`58`	`59`	`CREATE TABLE IF NOT EXISTS memory_index_chunks (`
`@@ -125,6 +126,12 @@ END;`
`125`	`126`	`CREATE INDEX IF NOT EXISTS idx_memory_embedding_cache_updated_at`
`126`	`127`	`ON memory_embedding_cache(updated_at);`
`127`	`128`
	`129`	`+CREATE INDEX IF NOT EXISTS idx_memory_index_sources_source`
	`130`	`+ ON memory_index_sources(source);`
	`131`	`+`
	`132`	`+CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path_source`
	`133`	`+ ON memory_index_chunks(path, source);`
	`134`	`+`
`128`	`135`	`CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path`
`129`	`136`	`ON memory_index_chunks(path);`
`130`	`137`

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,12 @@ CREATE TABLE IF NOT EXISTS memory_index_meta (`
`43`	`43`	`);`
`44`	`44`
`45`	`45`	`CREATE TABLE IF NOT EXISTS memory_index_sources (`
`46`		`-path TEXT PRIMARY KEY,`
	`46`	`+path TEXT NOT NULL,`
`47`	`47`	`source TEXT NOT NULL DEFAULT 'memory',`
`48`	`48`	`hash TEXT NOT NULL,`
`49`	`49`	`mtime INTEGER NOT NULL,`
`50`		`- size INTEGER NOT NULL`
	`50`	`+ size INTEGER NOT NULL,`
	`51`	`+PRIMARY KEY (path, source)`
`51`	`52`	`);`
`52`	`53`
`53`	`54`	`CREATE TABLE IF NOT EXISTS memory_index_chunks (`
`@@ -120,6 +121,12 @@ END;`
`120`	`121`	`CREATE INDEX IF NOT EXISTS idx_memory_embedding_cache_updated_at`
`121`	`122`	`ON memory_embedding_cache(updated_at);`
`122`	`123`
	`124`	`+CREATE INDEX IF NOT EXISTS idx_memory_index_sources_source`
	`125`	`+ON memory_index_sources(source);`
	`126`	`+`
	`127`	`+CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path_source`
	`128`	`+ON memory_index_chunks(path, source);`
	`129`	`+`
`123`	`130`	`CREATE INDEX IF NOT EXISTS idx_memory_index_chunks_path`
`124`	`131`	`ON memory_index_chunks(path);`
`125`	`132`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。