fix: v0.2.3 OPFS数据恢复 + Aria WAL事务边界修复
This commit is contained in:
@@ -133,8 +133,21 @@ export class AriaEngine implements IStorageEngine {
|
||||
// 6. 初始化 LSM(加载 SSTable 元数据)
|
||||
await this.lsm.init();
|
||||
|
||||
// 7. WAL 恢复(恢复未刷盘的数据)
|
||||
await this.wal.recover((record) => this.applyWALRecord(record));
|
||||
// 7. WAL 恢复(两阶段:先扫描事务边界,仅回放已提交事务)
|
||||
const committedTxns = new Set<number>();
|
||||
const allRecords: WALRecord[] = [];
|
||||
await this.wal.recover((r) => allRecords.push(r));
|
||||
// 第一遍:确定已提交事务
|
||||
for (const r of allRecords) {
|
||||
if (r.type === WALRecordType.COMMIT) committedTxns.add(r.txnId);
|
||||
if (r.type === WALRecordType.ROLLBACK) committedTxns.delete(r.txnId);
|
||||
}
|
||||
// 第二遍:仅应用 txnId==0(非事务)或已提交事务的数据
|
||||
for (const r of allRecords) {
|
||||
if (r.txnId === 0 || committedTxns.has(r.txnId)) {
|
||||
this.applyWALRecord(r);
|
||||
}
|
||||
}
|
||||
|
||||
// 8. Checkpoint Manager(BufferPool 暂简化,使用 flush 替代)
|
||||
this.checkpointManager = new CheckpointManager(
|
||||
@@ -668,6 +681,7 @@ export class AriaEngine implements IStorageEngine {
|
||||
case WALRecordType.COMMIT:
|
||||
case WALRecordType.ROLLBACK:
|
||||
case WALRecordType.BEGIN:
|
||||
case WALRecordType.DROP_TABLE:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+35
-1
@@ -34,8 +34,11 @@ export class OPFSEngine implements IStorageEngine {
|
||||
// 获取 OPFS 根目录
|
||||
this.root = await navigator.storage.getDirectory();
|
||||
|
||||
// 创建数据库目录
|
||||
// 创建/打开数据库目录
|
||||
this.tablesDir = await this.root.getDirectoryHandle(dbName, { create: true });
|
||||
|
||||
// 从 OPFS 恢复已有表数据到内存缓存
|
||||
await this.loadExistingTables();
|
||||
}
|
||||
|
||||
async close(): Promise<void> {
|
||||
@@ -180,6 +183,37 @@ export class OPFSEngine implements IStorageEngine {
|
||||
}
|
||||
}
|
||||
|
||||
/** 从 OPFS 加载已有表数据到内存缓存 */
|
||||
private async loadExistingTables(): Promise<void> {
|
||||
if (!this.tablesDir) return;
|
||||
const dir = this.tablesDir as any;
|
||||
for await (const [name] of dir.entries()) {
|
||||
if (!name.endsWith('.json')) continue;
|
||||
const tableName = name.replace('.json', '');
|
||||
try {
|
||||
const data = await this.readTableData(tableName);
|
||||
// 从数据中推断 schema(简化:从第一行提取列信息)
|
||||
if (data.length > 0) {
|
||||
const firstRow = data[0];
|
||||
const columns: Record<string, any> = {};
|
||||
for (const key of Object.keys(firstRow)) {
|
||||
const val = firstRow[key];
|
||||
const type = typeof val === 'number' ? 'number' :
|
||||
typeof val === 'boolean' ? 'boolean' :
|
||||
typeof val === 'object' ? 'json' : 'string';
|
||||
columns[key] = { type, primaryKey: key === 'id' };
|
||||
}
|
||||
await this.memoryCache.createTable({ name: tableName, columns });
|
||||
for (const row of data) {
|
||||
await this.memoryCache.insert(tableName, [row]);
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// 单个文件损坏不影响其他表
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 从 OPFS 加载表数据到内存缓存 */
|
||||
async loadTableIntoMemory(tableName: string, schema: TableSchema): Promise<void> {
|
||||
await this.memoryCache.createTable(schema);
|
||||
|
||||
Reference in New Issue
Block a user