fix(P2): v0.6.3 原子性/一致性/资源治理 — 8 项修复 + 12 回归
- KVStore 混合写单记录原子:新增 writeBatch(put+delete 同一条日志记录), KVStoreEngine 全部混合写路径统一(兑现真原子宣称,崩溃无新旧行并存) - WAL full 模式写入失败抛错(此前 console.warn 吞错 → 崩溃即丢且无感知) - MemoryEngine SET NULL 级联索引残留:复用 removeIndexEntries(消除虚假 UNIQUE_VIOLATION) - delete 级联两阶段:先全量 RESTRICT 预检(沿 CASCADE 链递归)再执行,无部分级联 (Memory/Aria 对齐) - BufferPool 驱逐同步清理 pages Map(EvictionManager onRemove 回调,内存预算真实生效) - MVCC commit 清理已提交版本(版本链仅作事务内 undo,消除行数据双份常驻) - LSM.flush 重复入链修复(入链即置空 immutable)+ frozenMemtables 可见性时序 - rollbackToSavepoint 重建受影响表二级索引(消除过期索引条目) 测试 1114 → 1126(71 套件);行覆盖率 89.7%;版本 0.6.3
This commit is contained in:
+50
-8
@@ -270,7 +270,15 @@ export class MemoryEngine implements IStorageEngine {
|
||||
toDelete.push(pk);
|
||||
}
|
||||
}
|
||||
// 级联删除:检查引用此表的其他表
|
||||
// v0.6.3-fix: 级联两阶段 —— 先对全部待删行做 RESTRICT 预检(沿 CASCADE 链递归),
|
||||
// 任何一行违规则整体拒绝。此前逐行执行:第 N 行 RESTRICT 抛错时,前 N-1 行的
|
||||
// 级联子行已被删除、父行未删 → 无事务下部分级联(数据不一致)
|
||||
const restrictVisited = new Set<string>();
|
||||
for (const pk of toDelete) {
|
||||
const row = table.get(pk);
|
||||
if (row) this.checkCascadeRestrict(tableName, pk, restrictVisited);
|
||||
}
|
||||
// 级联删除:检查引用此表的其他表(RESTRICT 已预检通过,此阶段不再抛错)
|
||||
let cascadeCount = 0;
|
||||
for (const pk of toDelete) {
|
||||
const row = table.get(pk);
|
||||
@@ -280,6 +288,42 @@ export class MemoryEngine implements IStorageEngine {
|
||||
return toDelete.length + cascadeCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* v0.6.3: RESTRICT 预检(delete 级联两阶段之一)。
|
||||
* 递归沿 CASCADE 链检查引用表:RESTRICT 引用存在依赖行则抛 FOREIGN_KEY_VIOLATION。
|
||||
*/
|
||||
private checkCascadeRestrict(tableName: string, pkValue: string, visited: Set<string>): void {
|
||||
const visitKey = `${tableName}:${pkValue}`;
|
||||
if (visited.has(visitKey)) return;
|
||||
visited.add(visitKey);
|
||||
|
||||
for (const [refTableName, refSchema] of this.schemas) {
|
||||
if (refTableName === tableName) continue;
|
||||
for (const [colName, colDef] of Object.entries(refSchema.columns)) {
|
||||
if (!colDef.references || !colDef.onDelete) continue;
|
||||
const [refTable] = colDef.references.split('.');
|
||||
if (refTable !== tableName) continue;
|
||||
const refTableData = this.tables.get(refTableName);
|
||||
if (!refTableData) continue;
|
||||
const refPks: string[] = [];
|
||||
for (const [refPk, refRow] of refTableData) {
|
||||
if (String(refRow[colName]) === pkValue) refPks.push(refPk);
|
||||
}
|
||||
if (colDef.onDelete === 'RESTRICT' && refPks.length > 0) {
|
||||
throw new DatabaseError(
|
||||
`Cannot delete from "${tableName}": foreign key "${colName}" in "${refTableName}" has dependent rows`,
|
||||
'FOREIGN_KEY_VIOLATION',
|
||||
);
|
||||
}
|
||||
if (colDef.onDelete === 'CASCADE') {
|
||||
for (const refPk of refPks) {
|
||||
this.checkCascadeRestrict(refTableName, refPk, visited);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async count(tableName: string, query?: QueryPlan): Promise<number> {
|
||||
this.ensureTable(tableName);
|
||||
const table = this.tables.get(tableName)!;
|
||||
@@ -554,14 +598,12 @@ export class MemoryEngine implements IStorageEngine {
|
||||
for (const refPk of toDelete) {
|
||||
const refRow = refTableData.get(refPk);
|
||||
if (refRow) {
|
||||
// v0.3.3: 外键列置空后同步更新索引
|
||||
if (refRow[colName] !== undefined && refRow[colName] !== null) {
|
||||
const pks = this.indexes.get(refTableName)?.get(colName);
|
||||
if (pks) {
|
||||
pks.get(refRow[colName])?.delete(refPk);
|
||||
}
|
||||
}
|
||||
// v0.6.3-fix: 复用 removeIndexEntries 清理旧值索引 —— 此前手动
|
||||
// `pks.get(v)?.delete(pk)` 后遗留空 Set → checkUniqueness 对旧值
|
||||
// 永久误报 UNIQUE_VIOLATION(外键列带 unique 约束时)
|
||||
this.removeIndexEntries(refTableName, refRow, refPk);
|
||||
refRow[colName] = null;
|
||||
this.updateIndexes(refTableName, refRow, refPk);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user