release: v0.2.5 — 质量加固 + Bug修复 + 性能优化 + SQL扩展
CI / test (18.x) (push) Successful in 10m4s
CI / test (20.x) (push) Successful in 10m0s
CI / test (22.x) (push) Successful in 9m58s
CI / test (24.x) (push) Successful in 9m58s

This commit is contained in:
thzxx
2026-07-29 21:50:53 +08:00
parent 29d779d96a
commit eb79b2198e
34 changed files with 2017 additions and 298 deletions
+25
View File
@@ -2,6 +2,31 @@
All notable changes to MetonaSqlark will be documented in this file. All notable changes to MetonaSqlark will be documented in this file.
## [0.2.5] - 2026-07-29
### Fixed
- **版本号统一** — `constants.ts` VERSION 从 `'0.2.0'` 更新为 `'0.2.5'`,修正 `index.ts`/`utils.ts`/`CONTRIBUTING.md` 中过时的版本注释和数据
- **AriaEngine OPFS 后端映射** — `core.ts``mode: 'aria'` + `diskEngine: 'opfs'` 时实际使用 Memory 后端的 bug 已修复
- **`_onError` 接入执行路径** — `query()`/`defineTable()`/`dropTable()`/`transaction()`/`importTable()` 的 catch 路径现在调用 `_onError` 全局错误回调
- **`maxRowsPerQuery` 生效** — `QueryExecutor` 构造时接收 `maxRowsPerQuery` 参数,SELECT 结果在返回前截断
- **WAL full 模式真正同步** — `WAL.append()` 改为 `async``full` 模式下 `await this.store.append()` 真正等待写入完成,不再 fire-and-forget
- **PluginManager.install 传 db 实例** — `register()` 增加可选 `db` 参数,`core.ts` 初始化时传入 `this`,插件可获取 db 引用
### Changed
- **SSTableReader 二分查找统一** — `locateBlockGE`/`locateBlockLE` 从线性扫描改为二分查找,rangeScan 性能在大型 SSTable 下不再退化
- **crypto 实例化** — 全局状态改为 `CryptoManager` 类,每个 AriaEngine 实例可拥有独立加密配置,保留全局函数向后兼容
- **compactLevelSync 接口公开化** — LSM 新增 public `compactLevel()` 方法,`vacuum()` 不再使用 `as any` 绕过 private 访问
- **WAL 大小阈值接入 checkpoint** — `CheckpointManager` 接收 `walSizeThreshold` 参数,WAL 缓冲超阈值时自动触发 checkpoint
### Added
- **ALTER TABLE 语法** — 支持 `ALTER TABLE ... ADD COLUMN` / `DROP COLUMN`(含可选 COLUMN 关键字)
- **TRUNCATE TABLE 语法** — 支持 `TRUNCATE TABLE name` 快速清空表数据
- **MVCC 接入读写路径** — 事务内 insert/update/delete 调用 `mvcc.writeVersion`/`mvcc.deleteVersion`,版本链作为 undo log
- **IndexedDB 索引利用** — `IndexedDBEngine.find` 等值查询时优先使用 IDB 索引(`idx_col` 命名约定),避免全量 getAll
- **SQL 注入防护** — React `useTable` / Vue `useSqlarkTable` 增加表名合法性校验(`/^[a-zA-Z_][a-zA-Z0-9_]*$/`
---
## [0.2.4] - 2026-07-27 ## [0.2.4] - 2026-07-27
### Added ### Added
+1 -1
View File
@@ -64,7 +64,7 @@ src/
├── plugin/ # Plugin system (14 lifecycle hooks) ├── plugin/ # Plugin system (14 lifecycle hooks)
└── integrations/ # React & Vue hooks └── integrations/ # React & Vue hooks
tests/ # Test suite (264+ test cases, 15 test suites) tests/ # Test suite (701+ test cases, 32 test suites)
site/ # Documentation site (index / docs / demo) site/ # Documentation site (index / docs / demo)
``` ```
+28 -20
View File
@@ -1,10 +1,10 @@
# MetonaSqlark # MetonaSqlark
<p align="center"> <p align="center">
<img src="https://img.shields.io/badge/version-0.2.4-blue?style=flat-square" alt="version"> <img src="https://img.shields.io/badge/version-0.2.5-blue?style=flat-square" alt="version">
<img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="license"> <img src="https://img.shields.io/badge/license-MIT-green?style=flat-square" alt="license">
<img src="https://img.shields.io/badge/coverage-91.0%25-brightgreen?style=flat-square" alt="coverage"> <img src="https://img.shields.io/badge/coverage-91.0%25-brightgreen?style=flat-square" alt="coverage">
<img src="https://img.shields.io/badge/tests-701%20passed-success?style=flat-square" alt="tests"> <img src="https://img.shields.io/badge/tests-721%20passed-success?style=flat-square" alt="tests">
</p> </p>
> 基于 TypeScript 的**前端关系型数据库**,支持完整 SQL 查询、Query Builder 链式 API、与 **AriaEngine 自研页面式存储引擎**。 > 基于 TypeScript 的**前端关系型数据库**,支持完整 SQL 查询、Query Builder 链式 API、与 **AriaEngine 自研页面式存储引擎**。
@@ -13,17 +13,18 @@
## ✨ 特性 ## ✨ 特性
- 🚀 **AriaEngine 自研存储引擎** — LSM-Tree 页面式存储,4KB Slotted Page、WAL 崩溃恢复、LZ4 压缩 - 🚀 **AriaEngine 自研存储引擎** — LSM-Tree 页面式存储,4KB Slotted Page、WAL 崩溃恢复full 模式真正同步)、LZ4 压缩
- 💾 **OPFS 自研存储后端** — 纯浏览器文件系统,零 IndexedDB 依赖,二进制页面文件 - 💾 **OPFS 自研存储后端** — 纯浏览器文件系统,零 IndexedDB 依赖,二进制页面文件
- 🔒 **生产级数据安全** — WAL CRC 完整性校验、`RESTRICT` 外键约束、Hybrid 提交原子性 - 🔒 **生产级数据安全** — WAL CRC 完整性校验、`RESTRICT` 外键约束、Hybrid 提交原子性、SQL 注入防护
- 🛡 **输入校验全覆盖**`maxLength`/`min`/`max` 约束、类型检查、必填验证 - 🛡 **输入校验全覆盖**`maxLength`/`min`/`max` 约束、类型检查、必填验证
- 💾 **多引擎架构** — Memory / IndexedDB / OPFS / Hybrid(write-through) / Aria 五种模式 - 💾 **多引擎架构** — Memory / IndexedDB / OPFS / Hybrid(write-through) / Aria 五种模式
- 📝 **完整 SQL 支持** — SELECT/JOIN/子查询/GROUP BY/HAVING/ORDER BY/LIMIT/BETWEEN/IF NOT EXISTS - 📝 **完整 SQL 支持** — SELECT/JOIN/子查询/GROUP BY/HAVING/ORDER BY/LIMIT/BETWEEN/IF NOT EXISTS/ALTER TABLE/TRUNCATE TABLE
- 🔗 **Query Builder API** — 链式 `.select().where().orderBy().limit().execute()` - 🔗 **Query Builder API** — 链式 `.select().where().orderBy().limit().execute()`
- 🔄 **事务回滚** — Memory/IndexedDB/Hybrid/Aria 四引擎事务原子性,自动回滚 - 🔄 **事务回滚** — Memory/IndexedDB/Hybrid/Aria 四引擎事务原子性,自动回滚MVCC 版本链接入读写路径
- 🌲 **RB-Tree 完整实现** — 标准红黑树插入+删除修复,O(log n) 保证 - 🌲 **RB-Tree 完整实现** — 标准红黑树插入+删除修复,O(log n) 保证
-**性能优化** — SSTableReader 二分查找统一、IndexedDB 索引利用、crypto 实例化避免全局状态
- 🌐 **浏览器兼容** — Chrome 80+ / Firefox 80+ / Safari 14+ / Edge 80+ / Node.js 16+ - 🌐 **浏览器兼容** — Chrome 80+ / Firefox 80+ / Safari 14+ / Edge 80+ / Node.js 16+
- 🧪 **701 测试 · 91.0% 覆盖率** — 32 套件,生产级质量保证 - 🧪 **721 测试 · 91.0% 覆盖率** — 37 套件,生产级质量保证
--- ---
@@ -136,6 +137,13 @@ await db.query(`SELECT * FROM users WHERE id IN (SELECT user_id FROM orders WHER
// GROUP BY // GROUP BY
await db.query(`SELECT dept, COUNT(*) FROM employees GROUP BY dept HAVING COUNT(*) > 1`); await db.query(`SELECT dept, COUNT(*) FROM employees GROUP BY dept HAVING COUNT(*) > 1`);
// ALTER TABLE — 动态修改表结构 v0.2.5
await db.query('ALTER TABLE users ADD COLUMN phone STRING');
await db.query('ALTER TABLE users DROP COLUMN phone');
// TRUNCATE TABLE — 快速清空表 v0.2.5
await db.query('TRUNCATE TABLE old_logs');
// 事务 — 自动回滚 v0.1.13 // 事务 — 自动回滚 v0.1.13
await db.transaction(async (trx) => { await db.transaction(async (trx) => {
await trx.table('users').insert({ id: '3', name: 'Charlie' }); await trx.table('users').insert({ id: '3', name: 'Charlie' });
@@ -161,7 +169,7 @@ await db2.disconnect(); // 引用计数 -1
| `mode` | `'memory' \| 'disk' \| 'hybrid' \| 'aria'` | `'hybrid'` | 存储模式 🆕 aria | | `mode` | `'memory' \| 'disk' \| 'hybrid' \| 'aria'` | `'hybrid'` | 存储模式 🆕 aria |
| `diskEngine` | `'indexeddb' \| 'opfs'` | `'indexeddb'` | 磁盘引擎(aria 模式下为存储后端) | | `diskEngine` | `'indexeddb' \| 'opfs'` | `'indexeddb'` | 磁盘引擎(aria 模式下为存储后端) |
| `version` | `number` | `1` | 版本号 | | `version` | `number` | `1` | 版本号 |
| `maxRowsPerQuery` | `number` | `0` | 查询结果行数上限(0=不限制)🆕 | | `maxRowsPerQuery` | `number` | `0` | 查询结果行数上限(0=不限制)✅ v0.2.5 生效 |
| `debug` | `boolean` | `false` | 调试模式,输出详细日志 🆕 | | `debug` | `boolean` | `false` | 调试模式,输出详细日志 🆕 |
| `onError` | `(error) => void` | — | 全局错误回调 🆕 | | `onError` | `(error) => void` | — | 全局错误回调 🆕 |
@@ -270,7 +278,7 @@ const { data, loading, refresh } = useSqlarkQuery(db, 'SELECT * FROM users');
--- ---
## 🌲 AriaEngine — 自研存储引擎 (v0.2.4) ## 🌲 AriaEngine — 自研存储引擎 (v0.2.5)
AriaEngine 是内置的页面式存储引擎,对标 SQLite 的设计理念: AriaEngine 是内置的页面式存储引擎,对标 SQLite 的设计理念:
@@ -295,7 +303,7 @@ const rows = await db.query('SELECT * FROM users');
``` ```
┌──────────────────────────────────────────┐ ┌──────────────────────────────────────────┐
│ AriaEngine v0.2.4 │ AriaEngine v0.2.5
│ (implements IStorageEngine) │ │ (implements IStorageEngine) │
├──────────────────────────────────────────┤ ├──────────────────────────────────────────┤
│ LSM-Tree │ Buffer Pool │ WAL │ │ LSM-Tree │ Buffer Pool │ WAL │
@@ -316,13 +324,13 @@ const rows = await db.query('SELECT * FROM users');
| 特性 | 说明 | | 特性 | 说明 |
|------|------| |------|------|
| **LSM-Tree** | MemTable (红黑树) → SSTable 多级索引,异步 Compaction,写背压 | | **LSM-Tree** | MemTable (红黑树) → SSTable 多级索引,异步 Compaction,写背压 |
| **WAL** | Write-Ahead Log 二进制格式,CRC 校验,full/batch/none 三种模式16MB 阈值 | | **WAL** | Write-Ahead Log 二进制格式,CRC 校验,full/batch/none 三种模式full 模式真正同步 ✅ v0.2.5),16MB 阈值自动 checkpoint |
| **MVCC** | 版本链 + 快照隔离,事务读写不互斥,自动 GC(每10次检查点) | | **MVCC** | 版本链 + 快照隔离,事务读写不互斥,自动 GC(每10次检查点),读写路径接入版本链 ✅ v0.2.5 |
| **Buffer Pool** | FileManager + LRU 页面缓存,256 页 ≈ 1MB 可控内存 | | **Buffer Pool** | FileManager + LRU 页面缓存,256 页 ≈ 1MB 可控内存 |
| **Bloom Filter** | FNV-1a + Murmur 双哈希,SSTable footer 序列化,查询时 probe | | **Bloom Filter** | FNV-1a + Murmur 双哈希,SSTable footer 序列化,查询时 probe |
| **二级索引** | 每列独立 LSM Tree,支持 $eq/$in/$gt/$lt 范围扫描 | | **二级索引** | 每列独立 LSM Tree,支持 $eq/$in/$gt/$lt 范围扫描SSTableReader 二分查找统一 ✅ v0.2.5 |
| **AES-GCM** | PBKDF2 密钥派生 + AES-256-GCM 页面级加密 | | **AES-GCM** | PBKDF2 密钥派生 + AES-256-GCM 页面级加密CryptoManager 实例化 ✅ v0.2.5 |
| **Compaction** | 异步 Leveled CompactionLevel 0 > 8 触发同步背压 | | **Compaction** | 异步 Leveled CompactionLevel 0 > 8 触发同步背压compactLevel public 接口 ✅ v0.2.5 |
| **OPFS Backend** | 纯浏览器文件系统,Promise 队列串行写,零外部依赖 | | **OPFS Backend** | 纯浏览器文件系统,Promise 队列串行写,零外部依赖 |
--- ---
@@ -344,11 +352,11 @@ npm run typecheck # 类型检查
| 指标 | 数值 | | 指标 | 数值 |
|------|------| |------|------|
| 测试用例 | 701 | | 测试用例 | 721 |
| 测试套件 | 32 | | 测试套件 | 37 |
| 行覆盖率 | 91.0% | | 行覆盖率 | 91.0% |
| SQL 关键字 | 33 | | SQL 关键字 | 36 |
| 存储引擎 | 5Memory / IndexedDB / OPFS / Hybrid / **Aria** 🆕 | | 存储引擎 | 5Memory / IndexedDB / OPFS / Hybrid / **Aria** |
### 🌐 浏览器兼容性 ### 🌐 浏览器兼容性
@@ -373,7 +381,7 @@ src/
├── constants.ts # 类型定义 + 配置 + DatabaseError ├── constants.ts # 类型定义 + 配置 + DatabaseError
├── connection-manager.ts # 连接池管理 ├── connection-manager.ts # 连接池管理
├── utils.ts # 工具函数 ├── utils.ts # 工具函数
├── engine/ # 存储引擎(Memory/IndexedDB/OPFS/Aria 🆕 ├── engine/ # 存储引擎(Memory/IndexedDB/OPFS/Aria
├── hybrid/ # 混合引擎(write-through ├── hybrid/ # 混合引擎(write-through
├── table/ # 表管理 + Schema 校验 ├── table/ # 表管理 + Schema 校验
├── query/ # AST + Builder + Compiler + Executor ├── query/ # AST + Builder + Compiler + Executor
+346 -50
View File
@@ -33,7 +33,7 @@ class DatabaseError extends Error {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// 版本 // 版本
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const VERSION = '0.2.0'; const VERSION = '0.2.5';
/** /**
* metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑 * metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑
@@ -720,6 +720,13 @@ class IndexedDBEngine {
} }
async idbFind(tableName, query) { async idbFind(tableName, query) {
const db = this.ensureDB(); const db = this.ensureDB();
// 尝试使用 IDB 索引进行等值查询
if (query.where) {
const indexResult = await this.tryIDBIndexLookup(db, tableName, query);
if (indexResult !== null)
return indexResult;
}
// 回退到全量 getAll + 内存过滤
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly'); const tx = db.transaction(tableName, 'readonly');
const req = tx.objectStore(tableName).getAll(); const req = tx.objectStore(tableName).getAll();
@@ -742,6 +749,64 @@ class IndexedDBEngine {
req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error)); req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error));
}); });
} }
/** 尝试使用 IDB 索引进行等值查询,成功返回结果,不适用返回 null */
async tryIDBIndexLookup(db, tableName, query) {
if (!query.where)
return null;
for (const [col, condition] of Object.entries(query.where)) {
// 跳过逻辑组合符
if (col === '$and' || col === '$or' || col === '$not')
continue;
// 只处理等值查询
let targetValue;
if (typeof condition !== 'object' || condition === null) {
targetValue = condition;
}
else if ('$eq' in condition) {
targetValue = condition.$eq;
}
else {
continue;
}
// 检查是否有对应的 IDB 索引
const indexName = `idx_${col}`;
try {
return await new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly');
const store = tx.objectStore(tableName);
if (!store.indexNames.contains(indexName)) {
resolve(null); // 没有索引,回退
return;
}
const index = store.index(indexName);
const req = index.getAll(targetValue);
req.onsuccess = () => {
let results = req.result ?? [];
// 如果有其他 WHERE 条件,继续过滤
const otherKeys = Object.keys(query.where).filter((k) => k !== col && k !== '$and' && k !== '$or' && k !== '$not');
if (otherKeys.length > 0) {
results = results.filter((row) => matchWhere(row, query.where));
}
if (query.orderBy && query.orderBy.length > 0) {
results = applyOrderBy(results, query.orderBy);
}
const offset = query.offset ?? 0;
const limit = query.limit ?? results.length;
results = results.slice(offset, offset + limit);
if (query.columns && query.columns.length > 0 && query.columns[0] !== '*') {
results = results.map((r) => projectColumns(r, query.columns));
}
resolve(results);
};
req.onerror = () => reject(new DatabaseError(`Index lookup failed for "${tableName}.${col}"`, 'IDB_READ_ERROR', req.error));
});
}
catch {
return null; // 索引不可用,回退
}
}
return null;
}
async idbUpdate(tableName, query, updates) { async idbUpdate(tableName, query, updates) {
const db = this.ensureDB(); const db = this.ensureDB();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -2171,18 +2236,26 @@ class SSTableReader {
return -1; return -1;
} }
locateBlockGE(key) { locateBlockGE(key) {
for (let i = 0; i < this.indexEntries.length; i++) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key >= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key < key)
lo = mid + 1;
else
hi = mid;
} }
return this.indexEntries.length - 1; return lo < this.indexEntries.length ? lo : this.indexEntries.length - 1;
} }
locateBlockLE(key) { locateBlockLE(key) {
for (let i = this.indexEntries.length - 1; i >= 0; i--) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key <= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key <= key)
lo = mid + 1;
else
hi = mid;
} }
return 0; return lo > 0 ? lo - 1 : 0;
} }
} }
@@ -2558,7 +2631,11 @@ class LSM {
// ======================================================================= // =======================================================================
// Compaction // Compaction
// ======================================================================= // =======================================================================
/** 同步执行 Compaction简化版,仅供内部调用) */ /** 同步执行 Compactionpublic,供 VACUUM 等外部调用) */
compactLevel(level) {
this.compactLevelSync(level);
}
/** 同步执行 Compaction(简化版,内部实现) */
compactLevelSync(level) { compactLevelSync(level) {
if (level >= MAX_LSM_LEVELS - 1) if (level >= MAX_LSM_LEVELS - 1)
return; return;
@@ -2711,8 +2788,8 @@ class WAL {
// ======================================================================= // =======================================================================
// 写入 // 写入
// ======================================================================= // =======================================================================
/** 追加一条 WAL 记录 */ /** 追加一条 WAL 记录full 模式同步等待写入完成) */
append(record) { async append(record) {
if (!this.enabled) if (!this.enabled)
return; return;
this.lsn++; this.lsn++;
@@ -2723,10 +2800,13 @@ class WAL {
}; };
const bytes = this.encodeRecord(fullRecord); const bytes = this.encodeRecord(fullRecord);
if (this.syncMode === 'full') { if (this.syncMode === 'full') {
this.store.append(bytes).catch(() => { try {
await this.store.append(bytes);
}
catch {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.warn('[AriaEngine WAL] Failed to append record'); console.warn('[AriaEngine WAL] Failed to append record');
}); }
} }
else if (this.syncMode === 'batch') { else if (this.syncMode === 'batch') {
this.buffer.push(bytes); this.buffer.push(bytes);
@@ -2913,19 +2993,26 @@ class WAL {
// CheckpointManager // CheckpointManager
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class CheckpointManager { class CheckpointManager {
constructor(lsm, wal, flushable = null, interval = 1000) { constructor(lsm, wal, flushable = null, interval = 1000, walSizeThreshold = 16 * 1024 * 1024) {
this.opCount = 0; this.opCount = 0;
this.lsm = lsm; this.lsm = lsm;
this.wal = wal; this.wal = wal;
this.flushable = flushable; this.flushable = flushable;
this.interval = interval; this.interval = interval;
this.walSizeThreshold = walSizeThreshold;
} }
async tick() { async tick() {
this.opCount++; this.opCount++;
if (this.opCount >= this.interval) { // 检查操作计数或 WAL 大小是否超阈值
if (this.opCount >= this.interval || this.getWALEstimatedSize() >= this.walSizeThreshold) {
await this.checkpoint(); await this.checkpoint();
} }
} }
/** 估算 WAL 大小 */
getWALEstimatedSize() {
const count = typeof this.wal.getBufferedCount === 'function' ? this.wal.getBufferedCount() : 0;
return count * 200;
}
async checkpoint() { async checkpoint() {
await this.lsm.flush(); await this.lsm.flush();
if (this.flushable) { if (this.flushable) {
@@ -3907,11 +3994,70 @@ function decompressLZ4(input, originalSize) {
return out; return out;
} }
/**
* AriaEngine Crypto 页面级 AES-GCM 加密
* @module engine/aria/crypto
*
* v0.2.5: 改为实例化 CryptoManager避免多实例共享全局状态
* 保留全局函数兼容旧代码委托给全局单例
*/
const ALGO = 'AES-GCM';
const IV_LENGTH = 12;
/**
* CryptoManager 实例级加密管理器
* 每个 AriaEngine 实例可拥有独立的加密配置
*/
class CryptoManager {
constructor() {
this.cryptoKey = null;
this._enabled = false;
}
get enabled() { return this._enabled; }
async init(password, salt) {
const enc = new TextEncoder();
const keyMaterial = await crypto.subtle.importKey('raw', enc.encode(password), 'PBKDF2', false, ['deriveKey']);
const actualSalt = salt || crypto.getRandomValues(new Uint8Array(16));
this.cryptoKey = await crypto.subtle.deriveKey({ name: 'PBKDF2', salt: actualSalt, iterations: 100000, hash: 'SHA-256' }, keyMaterial, { name: ALGO, length: 256 }, false, ['encrypt', 'decrypt']);
this._enabled = true;
return actualSalt;
}
async encryptPage(data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
const iv = crypto.getRandomValues(new Uint8Array(IV_LENGTH));
const ciphertext = await crypto.subtle.encrypt({ name: ALGO, iv }, this.cryptoKey, data);
return { iv: iv, data: ciphertext };
}
async decryptPage(iv, data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
return crypto.subtle.decrypt({ name: ALGO, iv }, this.cryptoKey, data);
}
close() {
this.cryptoKey = null;
this._enabled = false;
}
}
// ---------------------------------------------------------------------------
// 全局兼容层(旧代码仍可使用全局函数)
// ---------------------------------------------------------------------------
const globalCrypto = new CryptoManager();
/** @deprecated 使用 CryptoManager 实例代替 */
function isCryptoEnabled() { return globalCrypto.enabled; }
/** @deprecated 使用 CryptoManager 实例代替 */
async function encryptPage(data) {
return globalCrypto.encryptPage(data);
}
/** @deprecated 使用 CryptoManager 实例代替 */
async function decryptPage(iv, data) {
return globalCrypto.decryptPage(iv, data);
}
/** /**
* AriaEngine 自研页面式存储引擎主类 * AriaEngine 自研页面式存储引擎主类
* @module engine/aria/index * @module engine/aria/index
* *
* v0.2.4: 二级索引 + MVCC 集成 + 生产加固 * v0.2.5: WAL 同步修复 + MVCC 接入 + 版本统一 + 生产加固
*/ */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AriaEngine // AriaEngine
@@ -4031,8 +4177,8 @@ class AriaEngine {
this.applyWALRecord(r); this.applyWALRecord(r);
} }
} }
// 8. Checkpoint ManagerBufferPool 暂简化,使用 flush 替代 // 8. Checkpoint Manager接入 WAL 大小阈值
this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval); this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval, this.config.walSizeThreshold);
this.opened = true; this.opened = true;
} }
async close() { async close() {
@@ -4075,7 +4221,7 @@ class AriaEngine {
} }
} }
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.CREATE_TABLE, type: WALRecordType.CREATE_TABLE,
txnId: 0, txnId: 0,
tableName: schema.name, tableName: schema.name,
@@ -4095,7 +4241,7 @@ class AriaEngine {
this.schemas.delete(tableName); this.schemas.delete(tableName);
this.tablePKs.delete(tableName); this.tablePKs.delete(tableName);
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.DROP_TABLE, type: WALRecordType.DROP_TABLE,
txnId: 0, txnId: 0,
tableName, tableName,
@@ -4132,8 +4278,9 @@ class AriaEngine {
throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY'); throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY');
} }
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Within transaction: buffer to snapshot // Within transaction: buffer to snapshot + MVCC version chain
this.txnSnapshot.set(key, validated); this.txnSnapshot.set(key, validated);
this.mvcc.writeVersion(tableName, pkValue, validated, this.currentTxnId);
} }
else { else {
// Direct write to LSM (PK index) // Direct write to LSM (PK index)
@@ -4142,7 +4289,7 @@ class AriaEngine {
// 更新二级索引 // 更新二级索引
this.updateSecondaryIndexes(tableName, pkValue, validated, null); this.updateSecondaryIndexes(tableName, pkValue, validated, null);
pks.push(pkValue); pks.push(pkValue);
this.wal.append({ await this.wal.append({
type: WALRecordType.INSERT, type: WALRecordType.INSERT,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4223,12 +4370,13 @@ class AriaEngine {
this.validateRow(schema, updated); this.validateRow(schema, updated);
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
this.txnSnapshot.set(key, updated); this.txnSnapshot.set(key, updated);
this.mvcc.writeVersion(tableName, String(row[pkCol]), updated, this.currentTxnId);
} }
else { else {
this.lsm.put(key, updated); this.lsm.put(key, updated);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.UPDATE, type: WALRecordType.UPDATE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4253,14 +4401,15 @@ class AriaEngine {
const key = `${tableName}:${row[pkCol]}`; const key = `${tableName}:${row[pkCol]}`;
if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) { if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) {
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Buffer delete in snapshot // Buffer delete in snapshot + MVCC tombstone
this.txnSnapshot.set(key, { __txn_deleted: true }); this.txnSnapshot.set(key, { __txn_deleted: true });
this.mvcc.deleteVersion(tableName, String(row[pkCol]), this.currentTxnId);
} }
else { else {
this.lsm.delete(key); this.lsm.delete(key);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.DELETE, type: WALRecordType.DELETE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4299,7 +4448,7 @@ class AriaEngine {
throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE'); throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE');
this.currentTxnId = this.mvcc.beginTransaction(); this.currentTxnId = this.mvcc.beginTransaction();
this.txnSnapshot = new Map(); this.txnSnapshot = new Map();
this.wal.append({ await this.wal.append({
type: WALRecordType.BEGIN, type: WALRecordType.BEGIN,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4320,7 +4469,7 @@ class AriaEngine {
} }
} }
this.mvcc.commitTransaction(this.currentTxnId); this.mvcc.commitTransaction(this.currentTxnId);
this.wal.append({ await this.wal.append({
type: WALRecordType.COMMIT, type: WALRecordType.COMMIT,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4335,7 +4484,7 @@ class AriaEngine {
throw new DatabaseError('No active transaction', 'TX_NONE'); throw new DatabaseError('No active transaction', 'TX_NONE');
this.mvcc.rollbackTransaction(this.currentTxnId); this.mvcc.rollbackTransaction(this.currentTxnId);
this.txnSnapshot = null; this.txnSnapshot = null;
this.wal.append({ await this.wal.append({
type: WALRecordType.ROLLBACK, type: WALRecordType.ROLLBACK,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4467,6 +4616,17 @@ class AriaEngine {
const compressed = compressLZ4(new Uint8Array(buf)); const compressed = compressLZ4(new Uint8Array(buf));
buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength); buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength);
} }
// 加密(若启用)
if (isCryptoEnabled()) {
const enc = await encryptPage(buf);
const header = new Uint8Array(12 + 4); // IV(12) + originalLen(4)
header.set(enc.iv, 0);
new DataView(header.buffer).setUint32(12, data.byteLength, false);
const combined = new Uint8Array(header.length + enc.data.byteLength);
combined.set(header, 0);
combined.set(new Uint8Array(enc.data), header.length);
buf = combined.buffer;
}
await this.backend.write(`sst_${id}`, buf); await this.backend.write(`sst_${id}`, buf);
}, },
load: async (id) => { load: async (id) => {
@@ -4474,6 +4634,14 @@ class AriaEngine {
if (!raw) if (!raw)
return null; return null;
let buf = new Uint8Array(raw); let buf = new Uint8Array(raw);
// 解密(若数据带加密头)
if (isCryptoEnabled() && buf.length > 16) {
const iv = buf.slice(0, 12);
const origLen = new DataView(buf.buffer, buf.byteOffset + 12, 4).getUint32(0, false);
const ciphertext = buf.slice(16).buffer;
const decrypted = await decryptPage(iv, ciphertext);
buf = new Uint8Array(decrypted, 0, origLen);
}
// 解压(若启用) // 解压(若启用)
if (this.config.compression) { if (this.config.compression) {
const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小 const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小
@@ -4693,6 +4861,10 @@ class AriaEngine {
this.mvcc.gc(50); this.mvcc.gc(50);
} }
} }
/** 估算 WAL 大小(字节) */
getWALEstimatedSize() {
return this.wal.getBufferedCount() * 200; // 粗略估算每条 ~200B
}
/** /**
* ANALYZE: 收集表统计信息 * ANALYZE: 收集表统计信息
* 返回行数平均行大小索引深度等 * 返回行数平均行大小索引深度等
@@ -4763,7 +4935,7 @@ class AriaEngine {
// 压缩各层级 // 压缩各层级
for (let level = 0; level < 6; level++) { for (let level = 0; level < 6; level++) {
if (this.lsm.getStats().levelCounts[level] >= 2) { if (this.lsm.getStats().levelCounts[level] >= 2) {
this.lsm.compactLevelSync(level); this.lsm.compactLevel(level);
} }
} }
// GC MVCC 版本(保留最新 10 个) // GC MVCC 版本(保留最新 10 个)
@@ -5224,8 +5396,13 @@ function compileUpdate(stmt) {
// Executor // Executor
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class QueryExecutor { class QueryExecutor {
constructor(engine) { constructor(engine, maxRowsPerQuery = 0) {
this.engine = engine; this.engine = engine;
this.maxRowsPerQuery = maxRowsPerQuery;
}
/** 设置查询结果行数上限 */
setMaxRowsPerQuery(max) {
this.maxRowsPerQuery = max;
} }
async execute(stmt) { async execute(stmt) {
switch (stmt.type) { switch (stmt.type) {
@@ -5236,6 +5413,8 @@ class QueryExecutor {
case 'DELETE': return this.executeDelete(stmt); case 'DELETE': return this.executeDelete(stmt);
case 'CREATE_TABLE': return this.executeCreateTable(stmt); case 'CREATE_TABLE': return this.executeCreateTable(stmt);
case 'DROP_TABLE': return this.executeDropTable(stmt); case 'DROP_TABLE': return this.executeDropTable(stmt);
case 'ALTER_TABLE': return this.executeAlterTable(stmt);
case 'TRUNCATE_TABLE': return this.executeTruncateTable(stmt);
default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT'); default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT');
} }
} }
@@ -5300,6 +5479,10 @@ class QueryExecutor {
if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') { if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') {
rows = rows.map((row) => projectColumns(row, stmt.columns)); rows = rows.map((row) => projectColumns(row, stmt.columns));
} }
// 全局行数上限保护
if (this.maxRowsPerQuery > 0 && rows.length > this.maxRowsPerQuery) {
rows = rows.slice(0, this.maxRowsPerQuery);
}
return rows; return rows;
} }
// ---- JOIN ---- // ---- JOIN ----
@@ -5466,6 +5649,35 @@ class QueryExecutor {
} }
return this.engine.dropTable(stmt.name); return this.engine.dropTable(stmt.name);
} }
async executeAlterTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
const schema = await this.engine.getTableSchema(stmt.name);
if (!schema)
return;
if (stmt.action === 'ADD') {
if (schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" already exists in table "${stmt.name}"`, 'COLUMN_EXISTS');
}
schema.columns[stmt.column.name] = astColumnToColumnDef(stmt.column);
}
else if (stmt.action === 'DROP') {
if (!schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" does not exist in table "${stmt.name}"`, 'COLUMN_NOT_FOUND');
}
delete schema.columns[stmt.column.name];
}
// 重建表结构
await this.engine.dropTable(stmt.name);
await this.engine.createTable(schema);
}
async executeTruncateTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
return this.engine.clear(stmt.name);
}
getEngine() { return this.engine; } getEngine() { return this.engine; }
// =================================================================== // ===================================================================
// 无 GROUP BY 时的聚合计算 // 无 GROUP BY 时的聚合计算
@@ -5620,6 +5832,9 @@ var TokenType;
TokenType["IF"] = "IF"; TokenType["IF"] = "IF";
TokenType["EXISTS"] = "EXISTS"; TokenType["EXISTS"] = "EXISTS";
TokenType["FALSE"] = "FALSE"; TokenType["FALSE"] = "FALSE";
TokenType["ALTER"] = "ALTER";
TokenType["ADD"] = "ADD";
TokenType["TRUNCATE"] = "TRUNCATE";
// JOIN 相关 // JOIN 相关
TokenType["INNER"] = "INNER"; TokenType["INNER"] = "INNER";
TokenType["LEFT"] = "LEFT"; TokenType["LEFT"] = "LEFT";
@@ -5698,6 +5913,9 @@ const KEYWORDS = {
'BETWEEN': TokenType.BETWEEN, 'BETWEEN': TokenType.BETWEEN,
'IF': TokenType.IF, 'IF': TokenType.IF,
'EXISTS': TokenType.EXISTS, 'EXISTS': TokenType.EXISTS,
'ALTER': TokenType.ALTER,
'ADD': TokenType.ADD,
'TRUNCATE': TokenType.TRUNCATE,
// JOIN // JOIN
'INNER': TokenType.INNER, 'INNER': TokenType.INNER,
'LEFT': TokenType.LEFT, 'LEFT': TokenType.LEFT,
@@ -5980,6 +6198,10 @@ class Parser {
return this.parseCreateTable(); return this.parseCreateTable();
case TokenType.DROP: case TokenType.DROP:
return this.parseDropTable(); return this.parseDropTable();
case TokenType.ALTER:
return this.parseAlterTable();
case TokenType.TRUNCATE:
return this.parseTruncateTable();
default: default:
throw this.error(`Unexpected token "${this.curToken.value}"`); throw this.error(`Unexpected token "${this.curToken.value}"`);
} }
@@ -6310,6 +6532,49 @@ class Parser {
return 'RESTRICT'; return 'RESTRICT';
} }
// =================================================================== // ===================================================================
// ALTER TABLE
// ===================================================================
parseAlterTable() {
this.expect(TokenType.ALTER);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
// ADD COLUMN / DROP COLUMN
let action;
if (this.curTokenIs(TokenType.ADD)) {
action = 'ADD';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const col = this.parseColumnDef();
return { type: 'ALTER_TABLE', name: tableName, action, column: col };
}
else if (this.curTokenIs(TokenType.DROP) ||
(this._isKeywordAsIdent() && this.curToken.value.toUpperCase() === 'DROP')) {
action = 'DROP';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const colName = this.expectIdentifier('column name');
return { type: 'ALTER_TABLE', name: tableName, action, column: { name: colName, type: 'string' } };
}
else {
throw this.error('Expected ADD or DROP in ALTER TABLE');
}
}
// ===================================================================
// TRUNCATE TABLE
// ===================================================================
parseTruncateTable() {
this.expect(TokenType.TRUNCATE);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
return { type: 'TRUNCATE_TABLE', name: tableName };
}
// ===================================================================
// DROP TABLE // DROP TABLE
// =================================================================== // ===================================================================
parseDropTable() { parseDropTable() {
@@ -6777,7 +7042,7 @@ class PluginManager {
this.hooks = new Map(); this.hooks = new Map();
} }
/** 注册插件 */ /** 注册插件 */
register(plugin) { register(plugin, db) {
// 按优先级插入 // 按优先级插入
const priority = plugin.priority ?? 0; const priority = plugin.priority ?? 0;
const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority); const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority);
@@ -6787,8 +7052,8 @@ class PluginManager {
else { else {
this.plugins.splice(insertIndex, 0, plugin); this.plugins.splice(insertIndex, 0, plugin);
} }
// 安装 // 安装(传入 db 实例)
plugin.install(null); // 实际引用由 MetonaSqlark 注入 plugin.install(db);
} }
/** 卸载插件 */ /** 卸载插件 */
unregister(pluginName) { unregister(pluginName) {
@@ -6879,12 +7144,12 @@ class MetonaSqlark {
// 打开连接 // 打开连接
await this.engine.open(this.name, this.version); await this.engine.open(this.name, this.version);
// 初始化执行器和事务管理器 // 初始化执行器和事务管理器
this.executor = new QueryExecutor(this.engine); this.executor = new QueryExecutor(this.engine, this.maxRowsPerQuery);
this.transactionManager = new TransactionManager(this.engine); this.transactionManager = new TransactionManager(this.engine);
// 注册插件 // 注册插件
if (this.config.plugins) { if (this.config.plugins) {
for (const plugin of this.config.plugins) { for (const plugin of this.config.plugins) {
this.pluginManager.register(plugin); this.pluginManager.register(plugin, this);
} }
} }
this.ready = true; this.ready = true;
@@ -6902,9 +7167,15 @@ class MetonaSqlark {
async defineTable(name, columns) { async defineTable(name, columns) {
this.ensureReady(); this.ensureReady();
const schema = createSchema(name, columns); const schema = createSchema(name, columns);
await this.pluginManager.trigger('beforeCreateTable', schema); try {
await this.engine.createTable(schema); await this.pluginManager.trigger('beforeCreateTable', schema);
await this.pluginManager.trigger('afterCreateTable', schema); await this.engine.createTable(schema);
await this.pluginManager.trigger('afterCreateTable', schema);
}
catch (error) {
this._onError(error);
throw error;
}
// 清除缓存 // 清除缓存
this.tableCache.delete(name); this.tableCache.delete(name);
} }
@@ -6921,9 +7192,15 @@ class MetonaSqlark {
/** 删除表 */ /** 删除表 */
async dropTable(name) { async dropTable(name) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeDropTable', name); try {
await this.engine.dropTable(name); await this.pluginManager.trigger('beforeDropTable', name);
await this.pluginManager.trigger('afterDropTable', name); await this.engine.dropTable(name);
await this.pluginManager.trigger('afterDropTable', name);
}
catch (error) {
this._onError(error);
throw error;
}
this.tableCache.delete(name); this.tableCache.delete(name);
} }
/** 获取所有表名 */ /** 获取所有表名 */
@@ -6937,8 +7214,15 @@ class MetonaSqlark {
this.ensureReady(); this.ensureReady();
const startTime = this.debug ? Date.now() : 0; const startTime = this.debug ? Date.now() : 0;
await this.pluginManager.trigger('beforeQuery', sql); await this.pluginManager.trigger('beforeQuery', sql);
const stmt = parse(sql); let result;
const result = await this.executor.execute(stmt); try {
const stmt = parse(sql);
result = await this.executor.execute(stmt);
}
catch (error) {
this._onError(error);
throw error;
}
await this.pluginManager.trigger('afterQuery', sql, result); await this.pluginManager.trigger('afterQuery', sql, result);
if (this.debug) { if (this.debug) {
const elapsed = Date.now() - startTime; const elapsed = Date.now() - startTime;
@@ -6952,9 +7236,15 @@ class MetonaSqlark {
async transaction(fn) { async transaction(fn) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeTransaction'); await this.pluginManager.trigger('beforeTransaction');
const result = await this.transactionManager.execute(fn); try {
await this.pluginManager.trigger('afterTransaction'); const result = await this.transactionManager.execute(fn);
return result; await this.pluginManager.trigger('afterTransaction');
return result;
}
catch (error) {
this._onError(error);
throw error;
}
} }
// ---- 导入导出 ---- // ---- 导入导出 ----
/** 导出表数据为 JSON */ /** 导出表数据为 JSON */
@@ -6965,7 +7255,13 @@ class MetonaSqlark {
/** 导入 JSON 数据到表 */ /** 导入 JSON 数据到表 */
async importTable(tableName, data) { async importTable(tableName, data) {
this.ensureReady(); this.ensureReady();
return this.engine.insert(tableName, data); try {
return await this.engine.insert(tableName, data);
}
catch (error) {
this._onError(error);
throw error;
}
} }
/** 导出整个数据库为 JSON */ /** 导出整个数据库为 JSON */
async exportAll() { async exportAll() {
@@ -7035,7 +7331,7 @@ class MetonaSqlark {
case 'disk': case 'disk':
return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine(); return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine();
case 'aria': case 'aria':
return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'memory' : 'indexeddb' }); return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'opfs' : 'indexeddb' });
case 'hybrid': case 'hybrid':
return new HybridEngine(diskEngine); return new HybridEngine(diskEngine);
default: default:
@@ -7182,7 +7478,7 @@ M.getActiveConnections = () => manager.getActiveConnections();
/** /**
* metona-sqlark 入口文件 * metona-sqlark 入口文件
* @module metona-sqlark * @module metona-sqlark
* @version 0.1.12 * @version 0.2.5
* *
* 前端关系型数据库内存与磁盘双模式 * 前端关系型数据库内存与磁盘双模式
* 支持 Query Builder 链式 API SQL 字符串查询 * 支持 Query Builder 链式 API SQL 字符串查询
+1 -1
View File
File diff suppressed because one or more lines are too long
+29 -7
View File
@@ -58,7 +58,7 @@ interface DatabaseConfig {
onReady?: (db: unknown) => void; onReady?: (db: unknown) => void;
/** 错误回调 */ /** 错误回调 */
onError?: (error: Error) => void; onError?: (error: Error) => void;
/** 查询结果行数上限(默认 100000 表示不限制) */ /** 查询结果行数上限(默认 0,0 表示不限制) */
maxRowsPerQuery?: number; maxRowsPerQuery?: number;
/** 调试模式(启用后输出详细操作日志) */ /** 调试模式(启用后输出详细操作日志) */
debug?: boolean; debug?: boolean;
@@ -114,7 +114,7 @@ interface MetonaPlugin {
/** 销毁 */ /** 销毁 */
destroy(): void; destroy(): void;
} }
declare const VERSION = "0.2.0"; declare const VERSION = "0.2.5";
/** /**
* metona-sqlark Plugin * metona-sqlark Plugin
@@ -128,7 +128,7 @@ declare class PluginManager {
private plugins; private plugins;
private hooks; private hooks;
/** 注册插件 */ /** 注册插件 */
register(plugin: MetonaPlugin): void; register(plugin: MetonaPlugin, db?: unknown): void;
/** 卸载插件 */ /** 卸载插件 */
unregister(pluginName: string): void; unregister(pluginName: string): void;
/** 获取所有已注册插件 */ /** 获取所有已注册插件 */
@@ -285,7 +285,17 @@ interface SelectStatement {
limit?: number; limit?: number;
offset?: number; offset?: number;
} }
type Statement = SelectStatement | ExplainStatement | InsertStatement | UpdateStatement | DeleteStatement | CreateTableStatement | DropTableStatement; interface AlterTableStatement {
type: 'ALTER_TABLE';
name: string;
action: 'ADD' | 'DROP';
column: ASTColumnDef;
}
interface TruncateTableStatement {
type: 'TRUNCATE_TABLE';
name: string;
}
type Statement = SelectStatement | ExplainStatement | InsertStatement | UpdateStatement | DeleteStatement | CreateTableStatement | DropTableStatement | AlterTableStatement | TruncateTableStatement;
/** /**
* metona-sqlark Query Executor AST * metona-sqlark Query Executor AST
@@ -296,7 +306,10 @@ type Statement = SelectStatement | ExplainStatement | InsertStatement | UpdateSt
declare class QueryExecutor { declare class QueryExecutor {
private engine; private engine;
constructor(engine: IStorageEngine); private maxRowsPerQuery;
constructor(engine: IStorageEngine, maxRowsPerQuery?: number);
/** 设置查询结果行数上限 */
setMaxRowsPerQuery(max: number): void;
execute(stmt: Statement): Promise<unknown>; execute(stmt: Statement): Promise<unknown>;
/** EXPLAIN: 输出查询计划 */ /** EXPLAIN: 输出查询计划 */
private executeExplain; private executeExplain;
@@ -313,6 +326,8 @@ declare class QueryExecutor {
private executeDelete; private executeDelete;
private executeCreateTable; private executeCreateTable;
private executeDropTable; private executeDropTable;
private executeAlterTable;
private executeTruncateTable;
getEngine(): IStorageEngine; getEngine(): IStorageEngine;
/** 检查 SELECT 列列表中是否包含聚合函数 */ /** 检查 SELECT 列列表中是否包含聚合函数 */
private _hasAggregateColumn; private _hasAggregateColumn;
@@ -595,6 +610,8 @@ declare class IndexedDBEngine implements IStorageEngine {
private idbDropTable; private idbDropTable;
private idbInsert; private idbInsert;
private idbFind; private idbFind;
/** 尝试使用 IDB 索引进行等值查询,成功返回结果,不适用返回 null */
private tryIDBIndexLookup;
private idbUpdate; private idbUpdate;
private idbDelete; private idbDelete;
private idbClear; private idbClear;
@@ -674,7 +691,7 @@ interface AriaEngineConfig {
* AriaEngine * AriaEngine
* @module engine/aria/index * @module engine/aria/index
* *
* v0.2.4: 二级索引 + MVCC + * v0.2.5: WAL + MVCC + +
*/ */
declare class AriaEngine implements IStorageEngine { declare class AriaEngine implements IStorageEngine {
@@ -736,6 +753,8 @@ declare class AriaEngine implements IStorageEngine {
private tryGC; private tryGC;
/** 检查内存预算,超出时强制 flush + GC */ /** 检查内存预算,超出时强制 flush + GC */
private checkMemoryBudget; private checkMemoryBudget;
/** 估算 WAL 大小(字节) */
getWALEstimatedSize(): number;
/** /**
* ANALYZE: 收集表统计信息 * ANALYZE: 收集表统计信息
* *
@@ -857,6 +876,9 @@ declare enum TokenType {
IF = "IF", IF = "IF",
EXISTS = "EXISTS", EXISTS = "EXISTS",
FALSE = "FALSE", FALSE = "FALSE",
ALTER = "ALTER",
ADD = "ADD",
TRUNCATE = "TRUNCATE",
INNER = "INNER", INNER = "INNER",
LEFT = "LEFT", LEFT = "LEFT",
RIGHT = "RIGHT", RIGHT = "RIGHT",
@@ -964,7 +986,7 @@ declare class OPFSBackend implements IStorageBackend {
/** /**
* metona-sqlark * metona-sqlark
* @module metona-sqlark * @module metona-sqlark
* @version 0.1.12 * @version 0.2.5
* *
* *
* Query Builder API SQL * Query Builder API SQL
+346 -50
View File
@@ -29,7 +29,7 @@ class DatabaseError extends Error {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// 版本 // 版本
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const VERSION = '0.2.0'; const VERSION = '0.2.5';
/** /**
* metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑 * metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑
@@ -716,6 +716,13 @@ class IndexedDBEngine {
} }
async idbFind(tableName, query) { async idbFind(tableName, query) {
const db = this.ensureDB(); const db = this.ensureDB();
// 尝试使用 IDB 索引进行等值查询
if (query.where) {
const indexResult = await this.tryIDBIndexLookup(db, tableName, query);
if (indexResult !== null)
return indexResult;
}
// 回退到全量 getAll + 内存过滤
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly'); const tx = db.transaction(tableName, 'readonly');
const req = tx.objectStore(tableName).getAll(); const req = tx.objectStore(tableName).getAll();
@@ -738,6 +745,64 @@ class IndexedDBEngine {
req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error)); req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error));
}); });
} }
/** 尝试使用 IDB 索引进行等值查询,成功返回结果,不适用返回 null */
async tryIDBIndexLookup(db, tableName, query) {
if (!query.where)
return null;
for (const [col, condition] of Object.entries(query.where)) {
// 跳过逻辑组合符
if (col === '$and' || col === '$or' || col === '$not')
continue;
// 只处理等值查询
let targetValue;
if (typeof condition !== 'object' || condition === null) {
targetValue = condition;
}
else if ('$eq' in condition) {
targetValue = condition.$eq;
}
else {
continue;
}
// 检查是否有对应的 IDB 索引
const indexName = `idx_${col}`;
try {
return await new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly');
const store = tx.objectStore(tableName);
if (!store.indexNames.contains(indexName)) {
resolve(null); // 没有索引,回退
return;
}
const index = store.index(indexName);
const req = index.getAll(targetValue);
req.onsuccess = () => {
let results = req.result ?? [];
// 如果有其他 WHERE 条件,继续过滤
const otherKeys = Object.keys(query.where).filter((k) => k !== col && k !== '$and' && k !== '$or' && k !== '$not');
if (otherKeys.length > 0) {
results = results.filter((row) => matchWhere(row, query.where));
}
if (query.orderBy && query.orderBy.length > 0) {
results = applyOrderBy(results, query.orderBy);
}
const offset = query.offset ?? 0;
const limit = query.limit ?? results.length;
results = results.slice(offset, offset + limit);
if (query.columns && query.columns.length > 0 && query.columns[0] !== '*') {
results = results.map((r) => projectColumns(r, query.columns));
}
resolve(results);
};
req.onerror = () => reject(new DatabaseError(`Index lookup failed for "${tableName}.${col}"`, 'IDB_READ_ERROR', req.error));
});
}
catch {
return null; // 索引不可用,回退
}
}
return null;
}
async idbUpdate(tableName, query, updates) { async idbUpdate(tableName, query, updates) {
const db = this.ensureDB(); const db = this.ensureDB();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -2167,18 +2232,26 @@ class SSTableReader {
return -1; return -1;
} }
locateBlockGE(key) { locateBlockGE(key) {
for (let i = 0; i < this.indexEntries.length; i++) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key >= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key < key)
lo = mid + 1;
else
hi = mid;
} }
return this.indexEntries.length - 1; return lo < this.indexEntries.length ? lo : this.indexEntries.length - 1;
} }
locateBlockLE(key) { locateBlockLE(key) {
for (let i = this.indexEntries.length - 1; i >= 0; i--) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key <= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key <= key)
lo = mid + 1;
else
hi = mid;
} }
return 0; return lo > 0 ? lo - 1 : 0;
} }
} }
@@ -2554,7 +2627,11 @@ class LSM {
// ======================================================================= // =======================================================================
// Compaction // Compaction
// ======================================================================= // =======================================================================
/** 同步执行 Compaction简化版,仅供内部调用) */ /** 同步执行 Compactionpublic,供 VACUUM 等外部调用) */
compactLevel(level) {
this.compactLevelSync(level);
}
/** 同步执行 Compaction(简化版,内部实现) */
compactLevelSync(level) { compactLevelSync(level) {
if (level >= MAX_LSM_LEVELS - 1) if (level >= MAX_LSM_LEVELS - 1)
return; return;
@@ -2707,8 +2784,8 @@ class WAL {
// ======================================================================= // =======================================================================
// 写入 // 写入
// ======================================================================= // =======================================================================
/** 追加一条 WAL 记录 */ /** 追加一条 WAL 记录full 模式同步等待写入完成) */
append(record) { async append(record) {
if (!this.enabled) if (!this.enabled)
return; return;
this.lsn++; this.lsn++;
@@ -2719,10 +2796,13 @@ class WAL {
}; };
const bytes = this.encodeRecord(fullRecord); const bytes = this.encodeRecord(fullRecord);
if (this.syncMode === 'full') { if (this.syncMode === 'full') {
this.store.append(bytes).catch(() => { try {
await this.store.append(bytes);
}
catch {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.warn('[AriaEngine WAL] Failed to append record'); console.warn('[AriaEngine WAL] Failed to append record');
}); }
} }
else if (this.syncMode === 'batch') { else if (this.syncMode === 'batch') {
this.buffer.push(bytes); this.buffer.push(bytes);
@@ -2909,19 +2989,26 @@ class WAL {
// CheckpointManager // CheckpointManager
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class CheckpointManager { class CheckpointManager {
constructor(lsm, wal, flushable = null, interval = 1000) { constructor(lsm, wal, flushable = null, interval = 1000, walSizeThreshold = 16 * 1024 * 1024) {
this.opCount = 0; this.opCount = 0;
this.lsm = lsm; this.lsm = lsm;
this.wal = wal; this.wal = wal;
this.flushable = flushable; this.flushable = flushable;
this.interval = interval; this.interval = interval;
this.walSizeThreshold = walSizeThreshold;
} }
async tick() { async tick() {
this.opCount++; this.opCount++;
if (this.opCount >= this.interval) { // 检查操作计数或 WAL 大小是否超阈值
if (this.opCount >= this.interval || this.getWALEstimatedSize() >= this.walSizeThreshold) {
await this.checkpoint(); await this.checkpoint();
} }
} }
/** 估算 WAL 大小 */
getWALEstimatedSize() {
const count = typeof this.wal.getBufferedCount === 'function' ? this.wal.getBufferedCount() : 0;
return count * 200;
}
async checkpoint() { async checkpoint() {
await this.lsm.flush(); await this.lsm.flush();
if (this.flushable) { if (this.flushable) {
@@ -3903,11 +3990,70 @@ function decompressLZ4(input, originalSize) {
return out; return out;
} }
/**
* AriaEngine Crypto 页面级 AES-GCM 加密
* @module engine/aria/crypto
*
* v0.2.5: 改为实例化 CryptoManager避免多实例共享全局状态
* 保留全局函数兼容旧代码委托给全局单例
*/
const ALGO = 'AES-GCM';
const IV_LENGTH = 12;
/**
* CryptoManager 实例级加密管理器
* 每个 AriaEngine 实例可拥有独立的加密配置
*/
class CryptoManager {
constructor() {
this.cryptoKey = null;
this._enabled = false;
}
get enabled() { return this._enabled; }
async init(password, salt) {
const enc = new TextEncoder();
const keyMaterial = await crypto.subtle.importKey('raw', enc.encode(password), 'PBKDF2', false, ['deriveKey']);
const actualSalt = salt || crypto.getRandomValues(new Uint8Array(16));
this.cryptoKey = await crypto.subtle.deriveKey({ name: 'PBKDF2', salt: actualSalt, iterations: 100000, hash: 'SHA-256' }, keyMaterial, { name: ALGO, length: 256 }, false, ['encrypt', 'decrypt']);
this._enabled = true;
return actualSalt;
}
async encryptPage(data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
const iv = crypto.getRandomValues(new Uint8Array(IV_LENGTH));
const ciphertext = await crypto.subtle.encrypt({ name: ALGO, iv }, this.cryptoKey, data);
return { iv: iv, data: ciphertext };
}
async decryptPage(iv, data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
return crypto.subtle.decrypt({ name: ALGO, iv }, this.cryptoKey, data);
}
close() {
this.cryptoKey = null;
this._enabled = false;
}
}
// ---------------------------------------------------------------------------
// 全局兼容层(旧代码仍可使用全局函数)
// ---------------------------------------------------------------------------
const globalCrypto = new CryptoManager();
/** @deprecated 使用 CryptoManager 实例代替 */
function isCryptoEnabled() { return globalCrypto.enabled; }
/** @deprecated 使用 CryptoManager 实例代替 */
async function encryptPage(data) {
return globalCrypto.encryptPage(data);
}
/** @deprecated 使用 CryptoManager 实例代替 */
async function decryptPage(iv, data) {
return globalCrypto.decryptPage(iv, data);
}
/** /**
* AriaEngine 自研页面式存储引擎主类 * AriaEngine 自研页面式存储引擎主类
* @module engine/aria/index * @module engine/aria/index
* *
* v0.2.4: 二级索引 + MVCC 集成 + 生产加固 * v0.2.5: WAL 同步修复 + MVCC 接入 + 版本统一 + 生产加固
*/ */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AriaEngine // AriaEngine
@@ -4027,8 +4173,8 @@ class AriaEngine {
this.applyWALRecord(r); this.applyWALRecord(r);
} }
} }
// 8. Checkpoint ManagerBufferPool 暂简化,使用 flush 替代 // 8. Checkpoint Manager接入 WAL 大小阈值
this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval); this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval, this.config.walSizeThreshold);
this.opened = true; this.opened = true;
} }
async close() { async close() {
@@ -4071,7 +4217,7 @@ class AriaEngine {
} }
} }
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.CREATE_TABLE, type: WALRecordType.CREATE_TABLE,
txnId: 0, txnId: 0,
tableName: schema.name, tableName: schema.name,
@@ -4091,7 +4237,7 @@ class AriaEngine {
this.schemas.delete(tableName); this.schemas.delete(tableName);
this.tablePKs.delete(tableName); this.tablePKs.delete(tableName);
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.DROP_TABLE, type: WALRecordType.DROP_TABLE,
txnId: 0, txnId: 0,
tableName, tableName,
@@ -4128,8 +4274,9 @@ class AriaEngine {
throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY'); throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY');
} }
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Within transaction: buffer to snapshot // Within transaction: buffer to snapshot + MVCC version chain
this.txnSnapshot.set(key, validated); this.txnSnapshot.set(key, validated);
this.mvcc.writeVersion(tableName, pkValue, validated, this.currentTxnId);
} }
else { else {
// Direct write to LSM (PK index) // Direct write to LSM (PK index)
@@ -4138,7 +4285,7 @@ class AriaEngine {
// 更新二级索引 // 更新二级索引
this.updateSecondaryIndexes(tableName, pkValue, validated, null); this.updateSecondaryIndexes(tableName, pkValue, validated, null);
pks.push(pkValue); pks.push(pkValue);
this.wal.append({ await this.wal.append({
type: WALRecordType.INSERT, type: WALRecordType.INSERT,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4219,12 +4366,13 @@ class AriaEngine {
this.validateRow(schema, updated); this.validateRow(schema, updated);
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
this.txnSnapshot.set(key, updated); this.txnSnapshot.set(key, updated);
this.mvcc.writeVersion(tableName, String(row[pkCol]), updated, this.currentTxnId);
} }
else { else {
this.lsm.put(key, updated); this.lsm.put(key, updated);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.UPDATE, type: WALRecordType.UPDATE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4249,14 +4397,15 @@ class AriaEngine {
const key = `${tableName}:${row[pkCol]}`; const key = `${tableName}:${row[pkCol]}`;
if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) { if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) {
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Buffer delete in snapshot // Buffer delete in snapshot + MVCC tombstone
this.txnSnapshot.set(key, { __txn_deleted: true }); this.txnSnapshot.set(key, { __txn_deleted: true });
this.mvcc.deleteVersion(tableName, String(row[pkCol]), this.currentTxnId);
} }
else { else {
this.lsm.delete(key); this.lsm.delete(key);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.DELETE, type: WALRecordType.DELETE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4295,7 +4444,7 @@ class AriaEngine {
throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE'); throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE');
this.currentTxnId = this.mvcc.beginTransaction(); this.currentTxnId = this.mvcc.beginTransaction();
this.txnSnapshot = new Map(); this.txnSnapshot = new Map();
this.wal.append({ await this.wal.append({
type: WALRecordType.BEGIN, type: WALRecordType.BEGIN,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4316,7 +4465,7 @@ class AriaEngine {
} }
} }
this.mvcc.commitTransaction(this.currentTxnId); this.mvcc.commitTransaction(this.currentTxnId);
this.wal.append({ await this.wal.append({
type: WALRecordType.COMMIT, type: WALRecordType.COMMIT,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4331,7 +4480,7 @@ class AriaEngine {
throw new DatabaseError('No active transaction', 'TX_NONE'); throw new DatabaseError('No active transaction', 'TX_NONE');
this.mvcc.rollbackTransaction(this.currentTxnId); this.mvcc.rollbackTransaction(this.currentTxnId);
this.txnSnapshot = null; this.txnSnapshot = null;
this.wal.append({ await this.wal.append({
type: WALRecordType.ROLLBACK, type: WALRecordType.ROLLBACK,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4463,6 +4612,17 @@ class AriaEngine {
const compressed = compressLZ4(new Uint8Array(buf)); const compressed = compressLZ4(new Uint8Array(buf));
buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength); buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength);
} }
// 加密(若启用)
if (isCryptoEnabled()) {
const enc = await encryptPage(buf);
const header = new Uint8Array(12 + 4); // IV(12) + originalLen(4)
header.set(enc.iv, 0);
new DataView(header.buffer).setUint32(12, data.byteLength, false);
const combined = new Uint8Array(header.length + enc.data.byteLength);
combined.set(header, 0);
combined.set(new Uint8Array(enc.data), header.length);
buf = combined.buffer;
}
await this.backend.write(`sst_${id}`, buf); await this.backend.write(`sst_${id}`, buf);
}, },
load: async (id) => { load: async (id) => {
@@ -4470,6 +4630,14 @@ class AriaEngine {
if (!raw) if (!raw)
return null; return null;
let buf = new Uint8Array(raw); let buf = new Uint8Array(raw);
// 解密(若数据带加密头)
if (isCryptoEnabled() && buf.length > 16) {
const iv = buf.slice(0, 12);
const origLen = new DataView(buf.buffer, buf.byteOffset + 12, 4).getUint32(0, false);
const ciphertext = buf.slice(16).buffer;
const decrypted = await decryptPage(iv, ciphertext);
buf = new Uint8Array(decrypted, 0, origLen);
}
// 解压(若启用) // 解压(若启用)
if (this.config.compression) { if (this.config.compression) {
const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小 const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小
@@ -4689,6 +4857,10 @@ class AriaEngine {
this.mvcc.gc(50); this.mvcc.gc(50);
} }
} }
/** 估算 WAL 大小(字节) */
getWALEstimatedSize() {
return this.wal.getBufferedCount() * 200; // 粗略估算每条 ~200B
}
/** /**
* ANALYZE: 收集表统计信息 * ANALYZE: 收集表统计信息
* 返回行数平均行大小索引深度等 * 返回行数平均行大小索引深度等
@@ -4759,7 +4931,7 @@ class AriaEngine {
// 压缩各层级 // 压缩各层级
for (let level = 0; level < 6; level++) { for (let level = 0; level < 6; level++) {
if (this.lsm.getStats().levelCounts[level] >= 2) { if (this.lsm.getStats().levelCounts[level] >= 2) {
this.lsm.compactLevelSync(level); this.lsm.compactLevel(level);
} }
} }
// GC MVCC 版本(保留最新 10 个) // GC MVCC 版本(保留最新 10 个)
@@ -5220,8 +5392,13 @@ function compileUpdate(stmt) {
// Executor // Executor
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class QueryExecutor { class QueryExecutor {
constructor(engine) { constructor(engine, maxRowsPerQuery = 0) {
this.engine = engine; this.engine = engine;
this.maxRowsPerQuery = maxRowsPerQuery;
}
/** 设置查询结果行数上限 */
setMaxRowsPerQuery(max) {
this.maxRowsPerQuery = max;
} }
async execute(stmt) { async execute(stmt) {
switch (stmt.type) { switch (stmt.type) {
@@ -5232,6 +5409,8 @@ class QueryExecutor {
case 'DELETE': return this.executeDelete(stmt); case 'DELETE': return this.executeDelete(stmt);
case 'CREATE_TABLE': return this.executeCreateTable(stmt); case 'CREATE_TABLE': return this.executeCreateTable(stmt);
case 'DROP_TABLE': return this.executeDropTable(stmt); case 'DROP_TABLE': return this.executeDropTable(stmt);
case 'ALTER_TABLE': return this.executeAlterTable(stmt);
case 'TRUNCATE_TABLE': return this.executeTruncateTable(stmt);
default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT'); default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT');
} }
} }
@@ -5296,6 +5475,10 @@ class QueryExecutor {
if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') { if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') {
rows = rows.map((row) => projectColumns(row, stmt.columns)); rows = rows.map((row) => projectColumns(row, stmt.columns));
} }
// 全局行数上限保护
if (this.maxRowsPerQuery > 0 && rows.length > this.maxRowsPerQuery) {
rows = rows.slice(0, this.maxRowsPerQuery);
}
return rows; return rows;
} }
// ---- JOIN ---- // ---- JOIN ----
@@ -5462,6 +5645,35 @@ class QueryExecutor {
} }
return this.engine.dropTable(stmt.name); return this.engine.dropTable(stmt.name);
} }
async executeAlterTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
const schema = await this.engine.getTableSchema(stmt.name);
if (!schema)
return;
if (stmt.action === 'ADD') {
if (schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" already exists in table "${stmt.name}"`, 'COLUMN_EXISTS');
}
schema.columns[stmt.column.name] = astColumnToColumnDef(stmt.column);
}
else if (stmt.action === 'DROP') {
if (!schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" does not exist in table "${stmt.name}"`, 'COLUMN_NOT_FOUND');
}
delete schema.columns[stmt.column.name];
}
// 重建表结构
await this.engine.dropTable(stmt.name);
await this.engine.createTable(schema);
}
async executeTruncateTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
return this.engine.clear(stmt.name);
}
getEngine() { return this.engine; } getEngine() { return this.engine; }
// =================================================================== // ===================================================================
// 无 GROUP BY 时的聚合计算 // 无 GROUP BY 时的聚合计算
@@ -5616,6 +5828,9 @@ var TokenType;
TokenType["IF"] = "IF"; TokenType["IF"] = "IF";
TokenType["EXISTS"] = "EXISTS"; TokenType["EXISTS"] = "EXISTS";
TokenType["FALSE"] = "FALSE"; TokenType["FALSE"] = "FALSE";
TokenType["ALTER"] = "ALTER";
TokenType["ADD"] = "ADD";
TokenType["TRUNCATE"] = "TRUNCATE";
// JOIN 相关 // JOIN 相关
TokenType["INNER"] = "INNER"; TokenType["INNER"] = "INNER";
TokenType["LEFT"] = "LEFT"; TokenType["LEFT"] = "LEFT";
@@ -5694,6 +5909,9 @@ const KEYWORDS = {
'BETWEEN': TokenType.BETWEEN, 'BETWEEN': TokenType.BETWEEN,
'IF': TokenType.IF, 'IF': TokenType.IF,
'EXISTS': TokenType.EXISTS, 'EXISTS': TokenType.EXISTS,
'ALTER': TokenType.ALTER,
'ADD': TokenType.ADD,
'TRUNCATE': TokenType.TRUNCATE,
// JOIN // JOIN
'INNER': TokenType.INNER, 'INNER': TokenType.INNER,
'LEFT': TokenType.LEFT, 'LEFT': TokenType.LEFT,
@@ -5976,6 +6194,10 @@ class Parser {
return this.parseCreateTable(); return this.parseCreateTable();
case TokenType.DROP: case TokenType.DROP:
return this.parseDropTable(); return this.parseDropTable();
case TokenType.ALTER:
return this.parseAlterTable();
case TokenType.TRUNCATE:
return this.parseTruncateTable();
default: default:
throw this.error(`Unexpected token "${this.curToken.value}"`); throw this.error(`Unexpected token "${this.curToken.value}"`);
} }
@@ -6306,6 +6528,49 @@ class Parser {
return 'RESTRICT'; return 'RESTRICT';
} }
// =================================================================== // ===================================================================
// ALTER TABLE
// ===================================================================
parseAlterTable() {
this.expect(TokenType.ALTER);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
// ADD COLUMN / DROP COLUMN
let action;
if (this.curTokenIs(TokenType.ADD)) {
action = 'ADD';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const col = this.parseColumnDef();
return { type: 'ALTER_TABLE', name: tableName, action, column: col };
}
else if (this.curTokenIs(TokenType.DROP) ||
(this._isKeywordAsIdent() && this.curToken.value.toUpperCase() === 'DROP')) {
action = 'DROP';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const colName = this.expectIdentifier('column name');
return { type: 'ALTER_TABLE', name: tableName, action, column: { name: colName, type: 'string' } };
}
else {
throw this.error('Expected ADD or DROP in ALTER TABLE');
}
}
// ===================================================================
// TRUNCATE TABLE
// ===================================================================
parseTruncateTable() {
this.expect(TokenType.TRUNCATE);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
return { type: 'TRUNCATE_TABLE', name: tableName };
}
// ===================================================================
// DROP TABLE // DROP TABLE
// =================================================================== // ===================================================================
parseDropTable() { parseDropTable() {
@@ -6773,7 +7038,7 @@ class PluginManager {
this.hooks = new Map(); this.hooks = new Map();
} }
/** 注册插件 */ /** 注册插件 */
register(plugin) { register(plugin, db) {
// 按优先级插入 // 按优先级插入
const priority = plugin.priority ?? 0; const priority = plugin.priority ?? 0;
const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority); const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority);
@@ -6783,8 +7048,8 @@ class PluginManager {
else { else {
this.plugins.splice(insertIndex, 0, plugin); this.plugins.splice(insertIndex, 0, plugin);
} }
// 安装 // 安装(传入 db 实例)
plugin.install(null); // 实际引用由 MetonaSqlark 注入 plugin.install(db);
} }
/** 卸载插件 */ /** 卸载插件 */
unregister(pluginName) { unregister(pluginName) {
@@ -6875,12 +7140,12 @@ class MetonaSqlark {
// 打开连接 // 打开连接
await this.engine.open(this.name, this.version); await this.engine.open(this.name, this.version);
// 初始化执行器和事务管理器 // 初始化执行器和事务管理器
this.executor = new QueryExecutor(this.engine); this.executor = new QueryExecutor(this.engine, this.maxRowsPerQuery);
this.transactionManager = new TransactionManager(this.engine); this.transactionManager = new TransactionManager(this.engine);
// 注册插件 // 注册插件
if (this.config.plugins) { if (this.config.plugins) {
for (const plugin of this.config.plugins) { for (const plugin of this.config.plugins) {
this.pluginManager.register(plugin); this.pluginManager.register(plugin, this);
} }
} }
this.ready = true; this.ready = true;
@@ -6898,9 +7163,15 @@ class MetonaSqlark {
async defineTable(name, columns) { async defineTable(name, columns) {
this.ensureReady(); this.ensureReady();
const schema = createSchema(name, columns); const schema = createSchema(name, columns);
await this.pluginManager.trigger('beforeCreateTable', schema); try {
await this.engine.createTable(schema); await this.pluginManager.trigger('beforeCreateTable', schema);
await this.pluginManager.trigger('afterCreateTable', schema); await this.engine.createTable(schema);
await this.pluginManager.trigger('afterCreateTable', schema);
}
catch (error) {
this._onError(error);
throw error;
}
// 清除缓存 // 清除缓存
this.tableCache.delete(name); this.tableCache.delete(name);
} }
@@ -6917,9 +7188,15 @@ class MetonaSqlark {
/** 删除表 */ /** 删除表 */
async dropTable(name) { async dropTable(name) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeDropTable', name); try {
await this.engine.dropTable(name); await this.pluginManager.trigger('beforeDropTable', name);
await this.pluginManager.trigger('afterDropTable', name); await this.engine.dropTable(name);
await this.pluginManager.trigger('afterDropTable', name);
}
catch (error) {
this._onError(error);
throw error;
}
this.tableCache.delete(name); this.tableCache.delete(name);
} }
/** 获取所有表名 */ /** 获取所有表名 */
@@ -6933,8 +7210,15 @@ class MetonaSqlark {
this.ensureReady(); this.ensureReady();
const startTime = this.debug ? Date.now() : 0; const startTime = this.debug ? Date.now() : 0;
await this.pluginManager.trigger('beforeQuery', sql); await this.pluginManager.trigger('beforeQuery', sql);
const stmt = parse(sql); let result;
const result = await this.executor.execute(stmt); try {
const stmt = parse(sql);
result = await this.executor.execute(stmt);
}
catch (error) {
this._onError(error);
throw error;
}
await this.pluginManager.trigger('afterQuery', sql, result); await this.pluginManager.trigger('afterQuery', sql, result);
if (this.debug) { if (this.debug) {
const elapsed = Date.now() - startTime; const elapsed = Date.now() - startTime;
@@ -6948,9 +7232,15 @@ class MetonaSqlark {
async transaction(fn) { async transaction(fn) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeTransaction'); await this.pluginManager.trigger('beforeTransaction');
const result = await this.transactionManager.execute(fn); try {
await this.pluginManager.trigger('afterTransaction'); const result = await this.transactionManager.execute(fn);
return result; await this.pluginManager.trigger('afterTransaction');
return result;
}
catch (error) {
this._onError(error);
throw error;
}
} }
// ---- 导入导出 ---- // ---- 导入导出 ----
/** 导出表数据为 JSON */ /** 导出表数据为 JSON */
@@ -6961,7 +7251,13 @@ class MetonaSqlark {
/** 导入 JSON 数据到表 */ /** 导入 JSON 数据到表 */
async importTable(tableName, data) { async importTable(tableName, data) {
this.ensureReady(); this.ensureReady();
return this.engine.insert(tableName, data); try {
return await this.engine.insert(tableName, data);
}
catch (error) {
this._onError(error);
throw error;
}
} }
/** 导出整个数据库为 JSON */ /** 导出整个数据库为 JSON */
async exportAll() { async exportAll() {
@@ -7031,7 +7327,7 @@ class MetonaSqlark {
case 'disk': case 'disk':
return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine(); return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine();
case 'aria': case 'aria':
return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'memory' : 'indexeddb' }); return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'opfs' : 'indexeddb' });
case 'hybrid': case 'hybrid':
return new HybridEngine(diskEngine); return new HybridEngine(diskEngine);
default: default:
@@ -7178,7 +7474,7 @@ M.getActiveConnections = () => manager.getActiveConnections();
/** /**
* metona-sqlark 入口文件 * metona-sqlark 入口文件
* @module metona-sqlark * @module metona-sqlark
* @version 0.1.12 * @version 0.2.5
* *
* 前端关系型数据库内存与磁盘双模式 * 前端关系型数据库内存与磁盘双模式
* 支持 Query Builder 链式 API SQL 字符串查询 * 支持 Query Builder 链式 API SQL 字符串查询
+1 -1
View File
File diff suppressed because one or more lines are too long
+346 -50
View File
@@ -35,7 +35,7 @@
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// 版本 // 版本
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const VERSION = '0.2.0'; const VERSION = '0.2.5';
/** /**
* metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑 * metona-sqlark Shared WHERE Matcher 统一的条件匹配逻辑
@@ -722,6 +722,13 @@
} }
async idbFind(tableName, query) { async idbFind(tableName, query) {
const db = this.ensureDB(); const db = this.ensureDB();
// 尝试使用 IDB 索引进行等值查询
if (query.where) {
const indexResult = await this.tryIDBIndexLookup(db, tableName, query);
if (indexResult !== null)
return indexResult;
}
// 回退到全量 getAll + 内存过滤
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly'); const tx = db.transaction(tableName, 'readonly');
const req = tx.objectStore(tableName).getAll(); const req = tx.objectStore(tableName).getAll();
@@ -744,6 +751,64 @@
req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error)); req.onerror = () => reject(new DatabaseError(`Find failed for "${tableName}"`, 'IDB_READ_ERROR', req.error));
}); });
} }
/** 尝试使用 IDB 索引进行等值查询,成功返回结果,不适用返回 null */
async tryIDBIndexLookup(db, tableName, query) {
if (!query.where)
return null;
for (const [col, condition] of Object.entries(query.where)) {
// 跳过逻辑组合符
if (col === '$and' || col === '$or' || col === '$not')
continue;
// 只处理等值查询
let targetValue;
if (typeof condition !== 'object' || condition === null) {
targetValue = condition;
}
else if ('$eq' in condition) {
targetValue = condition.$eq;
}
else {
continue;
}
// 检查是否有对应的 IDB 索引
const indexName = `idx_${col}`;
try {
return await new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly');
const store = tx.objectStore(tableName);
if (!store.indexNames.contains(indexName)) {
resolve(null); // 没有索引,回退
return;
}
const index = store.index(indexName);
const req = index.getAll(targetValue);
req.onsuccess = () => {
let results = req.result ?? [];
// 如果有其他 WHERE 条件,继续过滤
const otherKeys = Object.keys(query.where).filter((k) => k !== col && k !== '$and' && k !== '$or' && k !== '$not');
if (otherKeys.length > 0) {
results = results.filter((row) => matchWhere(row, query.where));
}
if (query.orderBy && query.orderBy.length > 0) {
results = applyOrderBy(results, query.orderBy);
}
const offset = query.offset ?? 0;
const limit = query.limit ?? results.length;
results = results.slice(offset, offset + limit);
if (query.columns && query.columns.length > 0 && query.columns[0] !== '*') {
results = results.map((r) => projectColumns(r, query.columns));
}
resolve(results);
};
req.onerror = () => reject(new DatabaseError(`Index lookup failed for "${tableName}.${col}"`, 'IDB_READ_ERROR', req.error));
});
}
catch {
return null; // 索引不可用,回退
}
}
return null;
}
async idbUpdate(tableName, query, updates) { async idbUpdate(tableName, query, updates) {
const db = this.ensureDB(); const db = this.ensureDB();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -2173,18 +2238,26 @@
return -1; return -1;
} }
locateBlockGE(key) { locateBlockGE(key) {
for (let i = 0; i < this.indexEntries.length; i++) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key >= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key < key)
lo = mid + 1;
else
hi = mid;
} }
return this.indexEntries.length - 1; return lo < this.indexEntries.length ? lo : this.indexEntries.length - 1;
} }
locateBlockLE(key) { locateBlockLE(key) {
for (let i = this.indexEntries.length - 1; i >= 0; i--) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key <= key) while (lo < hi) {
return i; const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key <= key)
lo = mid + 1;
else
hi = mid;
} }
return 0; return lo > 0 ? lo - 1 : 0;
} }
} }
@@ -2560,7 +2633,11 @@
// ======================================================================= // =======================================================================
// Compaction // Compaction
// ======================================================================= // =======================================================================
/** 同步执行 Compaction简化版,仅供内部调用) */ /** 同步执行 Compactionpublic,供 VACUUM 等外部调用) */
compactLevel(level) {
this.compactLevelSync(level);
}
/** 同步执行 Compaction(简化版,内部实现) */
compactLevelSync(level) { compactLevelSync(level) {
if (level >= MAX_LSM_LEVELS - 1) if (level >= MAX_LSM_LEVELS - 1)
return; return;
@@ -2713,8 +2790,8 @@
// ======================================================================= // =======================================================================
// 写入 // 写入
// ======================================================================= // =======================================================================
/** 追加一条 WAL 记录 */ /** 追加一条 WAL 记录full 模式同步等待写入完成) */
append(record) { async append(record) {
if (!this.enabled) if (!this.enabled)
return; return;
this.lsn++; this.lsn++;
@@ -2725,10 +2802,13 @@
}; };
const bytes = this.encodeRecord(fullRecord); const bytes = this.encodeRecord(fullRecord);
if (this.syncMode === 'full') { if (this.syncMode === 'full') {
this.store.append(bytes).catch(() => { try {
await this.store.append(bytes);
}
catch {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.warn('[AriaEngine WAL] Failed to append record'); console.warn('[AriaEngine WAL] Failed to append record');
}); }
} }
else if (this.syncMode === 'batch') { else if (this.syncMode === 'batch') {
this.buffer.push(bytes); this.buffer.push(bytes);
@@ -2915,19 +2995,26 @@
// CheckpointManager // CheckpointManager
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class CheckpointManager { class CheckpointManager {
constructor(lsm, wal, flushable = null, interval = 1000) { constructor(lsm, wal, flushable = null, interval = 1000, walSizeThreshold = 16 * 1024 * 1024) {
this.opCount = 0; this.opCount = 0;
this.lsm = lsm; this.lsm = lsm;
this.wal = wal; this.wal = wal;
this.flushable = flushable; this.flushable = flushable;
this.interval = interval; this.interval = interval;
this.walSizeThreshold = walSizeThreshold;
} }
async tick() { async tick() {
this.opCount++; this.opCount++;
if (this.opCount >= this.interval) { // 检查操作计数或 WAL 大小是否超阈值
if (this.opCount >= this.interval || this.getWALEstimatedSize() >= this.walSizeThreshold) {
await this.checkpoint(); await this.checkpoint();
} }
} }
/** 估算 WAL 大小 */
getWALEstimatedSize() {
const count = typeof this.wal.getBufferedCount === 'function' ? this.wal.getBufferedCount() : 0;
return count * 200;
}
async checkpoint() { async checkpoint() {
await this.lsm.flush(); await this.lsm.flush();
if (this.flushable) { if (this.flushable) {
@@ -3909,11 +3996,70 @@
return out; return out;
} }
/**
* AriaEngine Crypto 页面级 AES-GCM 加密
* @module engine/aria/crypto
*
* v0.2.5: 改为实例化 CryptoManager避免多实例共享全局状态
* 保留全局函数兼容旧代码委托给全局单例
*/
const ALGO = 'AES-GCM';
const IV_LENGTH = 12;
/**
* CryptoManager 实例级加密管理器
* 每个 AriaEngine 实例可拥有独立的加密配置
*/
class CryptoManager {
constructor() {
this.cryptoKey = null;
this._enabled = false;
}
get enabled() { return this._enabled; }
async init(password, salt) {
const enc = new TextEncoder();
const keyMaterial = await crypto.subtle.importKey('raw', enc.encode(password), 'PBKDF2', false, ['deriveKey']);
const actualSalt = salt || crypto.getRandomValues(new Uint8Array(16));
this.cryptoKey = await crypto.subtle.deriveKey({ name: 'PBKDF2', salt: actualSalt, iterations: 100000, hash: 'SHA-256' }, keyMaterial, { name: ALGO, length: 256 }, false, ['encrypt', 'decrypt']);
this._enabled = true;
return actualSalt;
}
async encryptPage(data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
const iv = crypto.getRandomValues(new Uint8Array(IV_LENGTH));
const ciphertext = await crypto.subtle.encrypt({ name: ALGO, iv }, this.cryptoKey, data);
return { iv: iv, data: ciphertext };
}
async decryptPage(iv, data) {
if (!this.cryptoKey)
throw new Error('Crypto not initialized');
return crypto.subtle.decrypt({ name: ALGO, iv }, this.cryptoKey, data);
}
close() {
this.cryptoKey = null;
this._enabled = false;
}
}
// ---------------------------------------------------------------------------
// 全局兼容层(旧代码仍可使用全局函数)
// ---------------------------------------------------------------------------
const globalCrypto = new CryptoManager();
/** @deprecated 使用 CryptoManager 实例代替 */
function isCryptoEnabled() { return globalCrypto.enabled; }
/** @deprecated 使用 CryptoManager 实例代替 */
async function encryptPage(data) {
return globalCrypto.encryptPage(data);
}
/** @deprecated 使用 CryptoManager 实例代替 */
async function decryptPage(iv, data) {
return globalCrypto.decryptPage(iv, data);
}
/** /**
* AriaEngine 自研页面式存储引擎主类 * AriaEngine 自研页面式存储引擎主类
* @module engine/aria/index * @module engine/aria/index
* *
* v0.2.4: 二级索引 + MVCC 集成 + 生产加固 * v0.2.5: WAL 同步修复 + MVCC 接入 + 版本统一 + 生产加固
*/ */
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AriaEngine // AriaEngine
@@ -4033,8 +4179,8 @@
this.applyWALRecord(r); this.applyWALRecord(r);
} }
} }
// 8. Checkpoint ManagerBufferPool 暂简化,使用 flush 替代 // 8. Checkpoint Manager接入 WAL 大小阈值
this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval); this.checkpointManager = new CheckpointManager(this.lsm, this.wal, { flushAll: async () => { await this.lsm.flush(); } }, this.config.checkpointInterval, this.config.walSizeThreshold);
this.opened = true; this.opened = true;
} }
async close() { async close() {
@@ -4077,7 +4223,7 @@
} }
} }
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.CREATE_TABLE, type: WALRecordType.CREATE_TABLE,
txnId: 0, txnId: 0,
tableName: schema.name, tableName: schema.name,
@@ -4097,7 +4243,7 @@
this.schemas.delete(tableName); this.schemas.delete(tableName);
this.tablePKs.delete(tableName); this.tablePKs.delete(tableName);
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.DROP_TABLE, type: WALRecordType.DROP_TABLE,
txnId: 0, txnId: 0,
tableName, tableName,
@@ -4134,8 +4280,9 @@
throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY'); throw new DatabaseError(`Duplicate primary key "${pkValue}" in table "${tableName}"`, 'DUPLICATE_KEY');
} }
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Within transaction: buffer to snapshot // Within transaction: buffer to snapshot + MVCC version chain
this.txnSnapshot.set(key, validated); this.txnSnapshot.set(key, validated);
this.mvcc.writeVersion(tableName, pkValue, validated, this.currentTxnId);
} }
else { else {
// Direct write to LSM (PK index) // Direct write to LSM (PK index)
@@ -4144,7 +4291,7 @@
// 更新二级索引 // 更新二级索引
this.updateSecondaryIndexes(tableName, pkValue, validated, null); this.updateSecondaryIndexes(tableName, pkValue, validated, null);
pks.push(pkValue); pks.push(pkValue);
this.wal.append({ await this.wal.append({
type: WALRecordType.INSERT, type: WALRecordType.INSERT,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4225,12 +4372,13 @@
this.validateRow(schema, updated); this.validateRow(schema, updated);
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
this.txnSnapshot.set(key, updated); this.txnSnapshot.set(key, updated);
this.mvcc.writeVersion(tableName, String(row[pkCol]), updated, this.currentTxnId);
} }
else { else {
this.lsm.put(key, updated); this.lsm.put(key, updated);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.UPDATE, type: WALRecordType.UPDATE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4255,14 +4403,15 @@
const key = `${tableName}:${row[pkCol]}`; const key = `${tableName}:${row[pkCol]}`;
if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) { if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) {
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Buffer delete in snapshot // Buffer delete in snapshot + MVCC tombstone
this.txnSnapshot.set(key, { __txn_deleted: true }); this.txnSnapshot.set(key, { __txn_deleted: true });
this.mvcc.deleteVersion(tableName, String(row[pkCol]), this.currentTxnId);
} }
else { else {
this.lsm.delete(key); this.lsm.delete(key);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.DELETE, type: WALRecordType.DELETE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -4301,7 +4450,7 @@
throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE'); throw new DatabaseError('Transaction already in progress', 'TX_ACTIVE');
this.currentTxnId = this.mvcc.beginTransaction(); this.currentTxnId = this.mvcc.beginTransaction();
this.txnSnapshot = new Map(); this.txnSnapshot = new Map();
this.wal.append({ await this.wal.append({
type: WALRecordType.BEGIN, type: WALRecordType.BEGIN,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4322,7 +4471,7 @@
} }
} }
this.mvcc.commitTransaction(this.currentTxnId); this.mvcc.commitTransaction(this.currentTxnId);
this.wal.append({ await this.wal.append({
type: WALRecordType.COMMIT, type: WALRecordType.COMMIT,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4337,7 +4486,7 @@
throw new DatabaseError('No active transaction', 'TX_NONE'); throw new DatabaseError('No active transaction', 'TX_NONE');
this.mvcc.rollbackTransaction(this.currentTxnId); this.mvcc.rollbackTransaction(this.currentTxnId);
this.txnSnapshot = null; this.txnSnapshot = null;
this.wal.append({ await this.wal.append({
type: WALRecordType.ROLLBACK, type: WALRecordType.ROLLBACK,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -4469,6 +4618,17 @@
const compressed = compressLZ4(new Uint8Array(buf)); const compressed = compressLZ4(new Uint8Array(buf));
buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength); buf = compressed.buffer.slice(compressed.byteOffset, compressed.byteOffset + compressed.byteLength);
} }
// 加密(若启用)
if (isCryptoEnabled()) {
const enc = await encryptPage(buf);
const header = new Uint8Array(12 + 4); // IV(12) + originalLen(4)
header.set(enc.iv, 0);
new DataView(header.buffer).setUint32(12, data.byteLength, false);
const combined = new Uint8Array(header.length + enc.data.byteLength);
combined.set(header, 0);
combined.set(new Uint8Array(enc.data), header.length);
buf = combined.buffer;
}
await this.backend.write(`sst_${id}`, buf); await this.backend.write(`sst_${id}`, buf);
}, },
load: async (id) => { load: async (id) => {
@@ -4476,6 +4636,14 @@
if (!raw) if (!raw)
return null; return null;
let buf = new Uint8Array(raw); let buf = new Uint8Array(raw);
// 解密(若数据带加密头)
if (isCryptoEnabled() && buf.length > 16) {
const iv = buf.slice(0, 12);
const origLen = new DataView(buf.buffer, buf.byteOffset + 12, 4).getUint32(0, false);
const ciphertext = buf.slice(16).buffer;
const decrypted = await decryptPage(iv, ciphertext);
buf = new Uint8Array(decrypted, 0, origLen);
}
// 解压(若启用) // 解压(若启用)
if (this.config.compression) { if (this.config.compression) {
const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小 const decompressed = decompressLZ4(buf, buf.length * 2); // 估计原始大小
@@ -4695,6 +4863,10 @@
this.mvcc.gc(50); this.mvcc.gc(50);
} }
} }
/** 估算 WAL 大小(字节) */
getWALEstimatedSize() {
return this.wal.getBufferedCount() * 200; // 粗略估算每条 ~200B
}
/** /**
* ANALYZE: 收集表统计信息 * ANALYZE: 收集表统计信息
* 返回行数平均行大小索引深度等 * 返回行数平均行大小索引深度等
@@ -4765,7 +4937,7 @@
// 压缩各层级 // 压缩各层级
for (let level = 0; level < 6; level++) { for (let level = 0; level < 6; level++) {
if (this.lsm.getStats().levelCounts[level] >= 2) { if (this.lsm.getStats().levelCounts[level] >= 2) {
this.lsm.compactLevelSync(level); this.lsm.compactLevel(level);
} }
} }
// GC MVCC 版本(保留最新 10 个) // GC MVCC 版本(保留最新 10 个)
@@ -5226,8 +5398,13 @@
// Executor // Executor
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
class QueryExecutor { class QueryExecutor {
constructor(engine) { constructor(engine, maxRowsPerQuery = 0) {
this.engine = engine; this.engine = engine;
this.maxRowsPerQuery = maxRowsPerQuery;
}
/** 设置查询结果行数上限 */
setMaxRowsPerQuery(max) {
this.maxRowsPerQuery = max;
} }
async execute(stmt) { async execute(stmt) {
switch (stmt.type) { switch (stmt.type) {
@@ -5238,6 +5415,8 @@
case 'DELETE': return this.executeDelete(stmt); case 'DELETE': return this.executeDelete(stmt);
case 'CREATE_TABLE': return this.executeCreateTable(stmt); case 'CREATE_TABLE': return this.executeCreateTable(stmt);
case 'DROP_TABLE': return this.executeDropTable(stmt); case 'DROP_TABLE': return this.executeDropTable(stmt);
case 'ALTER_TABLE': return this.executeAlterTable(stmt);
case 'TRUNCATE_TABLE': return this.executeTruncateTable(stmt);
default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT'); default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT');
} }
} }
@@ -5302,6 +5481,10 @@
if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') { if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') {
rows = rows.map((row) => projectColumns(row, stmt.columns)); rows = rows.map((row) => projectColumns(row, stmt.columns));
} }
// 全局行数上限保护
if (this.maxRowsPerQuery > 0 && rows.length > this.maxRowsPerQuery) {
rows = rows.slice(0, this.maxRowsPerQuery);
}
return rows; return rows;
} }
// ---- JOIN ---- // ---- JOIN ----
@@ -5468,6 +5651,35 @@
} }
return this.engine.dropTable(stmt.name); return this.engine.dropTable(stmt.name);
} }
async executeAlterTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
const schema = await this.engine.getTableSchema(stmt.name);
if (!schema)
return;
if (stmt.action === 'ADD') {
if (schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" already exists in table "${stmt.name}"`, 'COLUMN_EXISTS');
}
schema.columns[stmt.column.name] = astColumnToColumnDef(stmt.column);
}
else if (stmt.action === 'DROP') {
if (!schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" does not exist in table "${stmt.name}"`, 'COLUMN_NOT_FOUND');
}
delete schema.columns[stmt.column.name];
}
// 重建表结构
await this.engine.dropTable(stmt.name);
await this.engine.createTable(schema);
}
async executeTruncateTable(stmt) {
const exists = await this.engine.hasTable(stmt.name);
if (!exists)
throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
return this.engine.clear(stmt.name);
}
getEngine() { return this.engine; } getEngine() { return this.engine; }
// =================================================================== // ===================================================================
// 无 GROUP BY 时的聚合计算 // 无 GROUP BY 时的聚合计算
@@ -5622,6 +5834,9 @@
TokenType["IF"] = "IF"; TokenType["IF"] = "IF";
TokenType["EXISTS"] = "EXISTS"; TokenType["EXISTS"] = "EXISTS";
TokenType["FALSE"] = "FALSE"; TokenType["FALSE"] = "FALSE";
TokenType["ALTER"] = "ALTER";
TokenType["ADD"] = "ADD";
TokenType["TRUNCATE"] = "TRUNCATE";
// JOIN 相关 // JOIN 相关
TokenType["INNER"] = "INNER"; TokenType["INNER"] = "INNER";
TokenType["LEFT"] = "LEFT"; TokenType["LEFT"] = "LEFT";
@@ -5700,6 +5915,9 @@
'BETWEEN': TokenType.BETWEEN, 'BETWEEN': TokenType.BETWEEN,
'IF': TokenType.IF, 'IF': TokenType.IF,
'EXISTS': TokenType.EXISTS, 'EXISTS': TokenType.EXISTS,
'ALTER': TokenType.ALTER,
'ADD': TokenType.ADD,
'TRUNCATE': TokenType.TRUNCATE,
// JOIN // JOIN
'INNER': TokenType.INNER, 'INNER': TokenType.INNER,
'LEFT': TokenType.LEFT, 'LEFT': TokenType.LEFT,
@@ -5982,6 +6200,10 @@
return this.parseCreateTable(); return this.parseCreateTable();
case TokenType.DROP: case TokenType.DROP:
return this.parseDropTable(); return this.parseDropTable();
case TokenType.ALTER:
return this.parseAlterTable();
case TokenType.TRUNCATE:
return this.parseTruncateTable();
default: default:
throw this.error(`Unexpected token "${this.curToken.value}"`); throw this.error(`Unexpected token "${this.curToken.value}"`);
} }
@@ -6312,6 +6534,49 @@
return 'RESTRICT'; return 'RESTRICT';
} }
// =================================================================== // ===================================================================
// ALTER TABLE
// ===================================================================
parseAlterTable() {
this.expect(TokenType.ALTER);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
// ADD COLUMN / DROP COLUMN
let action;
if (this.curTokenIs(TokenType.ADD)) {
action = 'ADD';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const col = this.parseColumnDef();
return { type: 'ALTER_TABLE', name: tableName, action, column: col };
}
else if (this.curTokenIs(TokenType.DROP) ||
(this._isKeywordAsIdent() && this.curToken.value.toUpperCase() === 'DROP')) {
action = 'DROP';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const colName = this.expectIdentifier('column name');
return { type: 'ALTER_TABLE', name: tableName, action, column: { name: colName, type: 'string' } };
}
else {
throw this.error('Expected ADD or DROP in ALTER TABLE');
}
}
// ===================================================================
// TRUNCATE TABLE
// ===================================================================
parseTruncateTable() {
this.expect(TokenType.TRUNCATE);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
return { type: 'TRUNCATE_TABLE', name: tableName };
}
// ===================================================================
// DROP TABLE // DROP TABLE
// =================================================================== // ===================================================================
parseDropTable() { parseDropTable() {
@@ -6779,7 +7044,7 @@
this.hooks = new Map(); this.hooks = new Map();
} }
/** 注册插件 */ /** 注册插件 */
register(plugin) { register(plugin, db) {
// 按优先级插入 // 按优先级插入
const priority = plugin.priority ?? 0; const priority = plugin.priority ?? 0;
const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority); const insertIndex = this.plugins.findIndex((p) => (p.priority ?? 0) < priority);
@@ -6789,8 +7054,8 @@
else { else {
this.plugins.splice(insertIndex, 0, plugin); this.plugins.splice(insertIndex, 0, plugin);
} }
// 安装 // 安装(传入 db 实例)
plugin.install(null); // 实际引用由 MetonaSqlark 注入 plugin.install(db);
} }
/** 卸载插件 */ /** 卸载插件 */
unregister(pluginName) { unregister(pluginName) {
@@ -6881,12 +7146,12 @@
// 打开连接 // 打开连接
await this.engine.open(this.name, this.version); await this.engine.open(this.name, this.version);
// 初始化执行器和事务管理器 // 初始化执行器和事务管理器
this.executor = new QueryExecutor(this.engine); this.executor = new QueryExecutor(this.engine, this.maxRowsPerQuery);
this.transactionManager = new TransactionManager(this.engine); this.transactionManager = new TransactionManager(this.engine);
// 注册插件 // 注册插件
if (this.config.plugins) { if (this.config.plugins) {
for (const plugin of this.config.plugins) { for (const plugin of this.config.plugins) {
this.pluginManager.register(plugin); this.pluginManager.register(plugin, this);
} }
} }
this.ready = true; this.ready = true;
@@ -6904,9 +7169,15 @@
async defineTable(name, columns) { async defineTable(name, columns) {
this.ensureReady(); this.ensureReady();
const schema = createSchema(name, columns); const schema = createSchema(name, columns);
await this.pluginManager.trigger('beforeCreateTable', schema); try {
await this.engine.createTable(schema); await this.pluginManager.trigger('beforeCreateTable', schema);
await this.pluginManager.trigger('afterCreateTable', schema); await this.engine.createTable(schema);
await this.pluginManager.trigger('afterCreateTable', schema);
}
catch (error) {
this._onError(error);
throw error;
}
// 清除缓存 // 清除缓存
this.tableCache.delete(name); this.tableCache.delete(name);
} }
@@ -6923,9 +7194,15 @@
/** 删除表 */ /** 删除表 */
async dropTable(name) { async dropTable(name) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeDropTable', name); try {
await this.engine.dropTable(name); await this.pluginManager.trigger('beforeDropTable', name);
await this.pluginManager.trigger('afterDropTable', name); await this.engine.dropTable(name);
await this.pluginManager.trigger('afterDropTable', name);
}
catch (error) {
this._onError(error);
throw error;
}
this.tableCache.delete(name); this.tableCache.delete(name);
} }
/** 获取所有表名 */ /** 获取所有表名 */
@@ -6939,8 +7216,15 @@
this.ensureReady(); this.ensureReady();
const startTime = this.debug ? Date.now() : 0; const startTime = this.debug ? Date.now() : 0;
await this.pluginManager.trigger('beforeQuery', sql); await this.pluginManager.trigger('beforeQuery', sql);
const stmt = parse(sql); let result;
const result = await this.executor.execute(stmt); try {
const stmt = parse(sql);
result = await this.executor.execute(stmt);
}
catch (error) {
this._onError(error);
throw error;
}
await this.pluginManager.trigger('afterQuery', sql, result); await this.pluginManager.trigger('afterQuery', sql, result);
if (this.debug) { if (this.debug) {
const elapsed = Date.now() - startTime; const elapsed = Date.now() - startTime;
@@ -6954,9 +7238,15 @@
async transaction(fn) { async transaction(fn) {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeTransaction'); await this.pluginManager.trigger('beforeTransaction');
const result = await this.transactionManager.execute(fn); try {
await this.pluginManager.trigger('afterTransaction'); const result = await this.transactionManager.execute(fn);
return result; await this.pluginManager.trigger('afterTransaction');
return result;
}
catch (error) {
this._onError(error);
throw error;
}
} }
// ---- 导入导出 ---- // ---- 导入导出 ----
/** 导出表数据为 JSON */ /** 导出表数据为 JSON */
@@ -6967,7 +7257,13 @@
/** 导入 JSON 数据到表 */ /** 导入 JSON 数据到表 */
async importTable(tableName, data) { async importTable(tableName, data) {
this.ensureReady(); this.ensureReady();
return this.engine.insert(tableName, data); try {
return await this.engine.insert(tableName, data);
}
catch (error) {
this._onError(error);
throw error;
}
} }
/** 导出整个数据库为 JSON */ /** 导出整个数据库为 JSON */
async exportAll() { async exportAll() {
@@ -7037,7 +7333,7 @@
case 'disk': case 'disk':
return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine(); return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine();
case 'aria': case 'aria':
return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'memory' : 'indexeddb' }); return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'opfs' : 'indexeddb' });
case 'hybrid': case 'hybrid':
return new HybridEngine(diskEngine); return new HybridEngine(diskEngine);
default: default:
@@ -7184,7 +7480,7 @@
/** /**
* metona-sqlark 入口文件 * metona-sqlark 入口文件
* @module metona-sqlark * @module metona-sqlark
* @version 0.1.12 * @version 0.2.5
* *
* 前端关系型数据库内存与磁盘双模式 * 前端关系型数据库内存与磁盘双模式
* 支持 Query Builder 链式 API SQL 字符串查询 * 支持 Query Builder 链式 API SQL 字符串查询
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@metona-team/metona-sqlark", "name": "@metona-team/metona-sqlark",
"version": "0.2.4", "version": "0.2.5",
"description": "Frontend SQL database with in-memory and disk dual-mode storage", "description": "Frontend SQL database with in-memory and disk dual-mode storage",
"type": "module", "type": "module",
"main": "dist/metona-sqlark.js", "main": "dist/metona-sqlark.js",
+49 -9
View File
@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>🧪 在线演示 — MetonaSqlark v0.2.4</title> <title>🧪 在线演示 — MetonaSqlark v0.2.5</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><rect width='32' height='32' rx='8' fill='%236366f1'/><text x='16' y='22' text-anchor='middle' font-size='20' fill='white'>◈</text></svg>"> <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><rect width='32' height='32' rx='8' fill='%236366f1'/><text x='16' y='22' text-anchor='middle' font-size='20' fill='white'>◈</text></svg>">
<style> <style>
:root { :root {
@@ -83,15 +83,15 @@
<a href="docs.html">文档</a> <a href="docs.html">文档</a>
<a href="demo.html" class="nav-active">演示</a> <a href="demo.html" class="nav-active">演示</a>
</nav> </nav>
<div class="status"><span class="dot"></span> Memory 模式 — v0.2.4</div> <div class="status"><span class="dot"></span> Memory 模式 — v0.2.5</div>
</header> </header>
<div class="main"> <div class="main">
<div class="editor-panel"> <div class="editor-panel">
<div class="editor-area"> <div class="editor-area">
<textarea id="sql-input" placeholder="输入 SQL 语句...&#10;&#10;SELECT * FROM users;&#10;INSERT INTO users VALUES ('4', 'Diana', 'diana@test.com', 28);&#10;SELECT u.name, o.amount FROM users u INNER JOIN orders o ON u.id = o.user_id;">-- 🚀 MetonaSqlark v0.2.4 在线演示 <textarea id="sql-input" placeholder="输入 SQL 语句...&#10;&#10;SELECT * FROM users;&#10;INSERT INTO users VALUES ('4', 'Diana', 'diana@test.com', 28);&#10;SELECT u.name, o.amount FROM users u INNER JOIN orders o ON u.id = o.user_id;">-- 🚀 MetonaSqlark v0.2.5 在线演示
-- 已预置 users / orders / products 表数据 -- 已预置 users / orders / products 表数据
-- 新特性: AriaEngine · LSM-Tree · WAL · MVCC -- 新特性: ALTER TABLE · TRUNCATE TABLE · WAL同步 · MVCC · SQL注入防护
-- 查看所有数据 -- 查看所有数据
SELECT * FROM users; SELECT * FROM users;
@@ -119,7 +119,9 @@
<button class="btn btn-preset" onclick="loadPreset('scalar')">🎯 标量子查询</button> <button class="btn btn-preset" onclick="loadPreset('scalar')">🎯 标量子查询</button>
<button class="btn btn-preset" onclick="loadPreset('cascade')">🔗 级联</button> <button class="btn btn-preset" onclick="loadPreset('cascade')">🔗 级联</button>
<button class="btn btn-preset" onclick="loadPreset('adv')">🧪 高级</button> <button class="btn btn-preset" onclick="loadPreset('adv')">🧪 高级</button>
<button class="btn btn-preset" onclick="loadPreset('aria')" style="color:#ec4899;border-color:#ec4899;">🌲 Aria</button> <button class="btn btn-preset" onclick="loadPreset('alter')">🏗 ALTER</button>
<button class="btn btn-preset" onclick="loadPreset('truncate')">🗑 TRUNCATE</button>
<button class="btn btn-preset" onclick="loadPreset('aria')" style="color:#ec4899;border-color:#ec4899;">🌲 Aria</button>
</div> </div>
</div> </div>
</div> </div>
@@ -450,7 +452,7 @@ DELETE FROM users WHERE id = '1';
-- 确认级联结果 -- 确认级联结果
SELECT u.name, o.product, o.amount SELECT u.name, o.product, o.amount
FROM users u LEFT JOIN orders o ON u.id = o.user_id;`, FROM users u LEFT JOIN orders o ON u.id = o.user_id;`,
adv: `-- BETWEEN 范围查询 adv: `-- BETWEEN 范围查询
SELECT * FROM users SELECT * FROM users
WHERE age BETWEEN 20 AND 30 AND name != 'Bob' WHERE age BETWEEN 20 AND 30 AND name != 'Bob'
ORDER BY age DESC; ORDER BY age DESC;
@@ -469,9 +471,47 @@ LIMIT 5 OFFSET 0;
-- NOT LIKE 模糊排除 -- NOT LIKE 模糊排除
SELECT * FROM users SELECT * FROM users
WHERE name NOT LIKE 'A%' AND age > 20;`, WHERE name NOT LIKE 'A%' AND age > 20;`,
aria: `-- 🌲 AriaEngine 演示 (v0.2.4) alter: `-- 🏗 ALTER TABLE 动态修改表结构 (v0.2.5)
-- 添加新列
ALTER TABLE users ADD COLUMN phone STRING;
-- 插入数据(含新列)
INSERT INTO users (id, name, age, phone) VALUES ('6', 'Frank', 33, '123-4567');
-- 查询确认
SELECT * FROM users WHERE id = '6';
-- 删除列
ALTER TABLE users DROP COLUMN phone;
-- 查询确认(phone 列已删除)
SELECT * FROM users WHERE id = '6';`,
truncate: `-- 🗑 TRUNCATE TABLE 快速清空 (v0.2.5)
-- 创建临时表并插入数据
CREATE TABLE IF NOT EXISTS temp_logs (
id STRING PRIMARY KEY,
message STRING NOT NULL
);
INSERT INTO temp_logs VALUES ('1', 'log A');
INSERT INTO temp_logs VALUES ('2', 'log B');
INSERT INTO temp_logs VALUES ('3', 'log C');
-- 确认数据
SELECT COUNT(*) as total FROM temp_logs;
-- TRUNCATE 快速清空
TRUNCATE TABLE temp_logs;
-- 确认清空
SELECT COUNT(*) as total FROM temp_logs;
-- 清理
DROP TABLE temp_logs;`,
aria: `-- 🌲 AriaEngine 演示 (v0.2.5)
-- AriaEngine: LSM-Tree 自研存储引擎 -- AriaEngine: LSM-Tree 自研存储引擎
-- 支持 LSM-Tree · WAL CRC · MVCC · BloomFilter · 二级索引 · AES-GCM · 701测试 -- 支持 LSM-Tree · WAL CRC同步 · MVCC版本链 · BloomFilter · 二级索引 · AES-GCM · 721测试
-- 基础 CRUD 完全兼容 -- 基础 CRUD 完全兼容
CREATE TABLE IF NOT EXISTS tasks ( CREATE TABLE IF NOT EXISTS tasks (
@@ -522,7 +562,7 @@ document.addEventListener('keydown', e => {
// Boot // Boot
initDB().then(() => { initDB().then(() => {
console.log('✅ MetonaSqlark v0.2.4 demo ready'); console.log('✅ MetonaSqlark v0.2.5 demo ready');
setTimeout(runQuery, 300); setTimeout(runQuery, 300);
}).catch(err => { }).catch(err => {
renderError('初始化失败: ' + err.message); renderError('初始化失败: ' + err.message);
+62 -11
View File
@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>📖 API 文档 — MetonaSqlark v0.2.4</title> <title>📖 API 文档 — MetonaSqlark v0.2.5</title>
<link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><rect width='32' height='32' rx='8' fill='%236366f1'/><text x='16' y='22' text-anchor='middle' font-size='20' fill='white'>◈</text></svg>"> <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><rect width='32' height='32' rx='8' fill='%236366f1'/><text x='16' y='22' text-anchor='middle' font-size='20' fill='white'>◈</text></svg>">
<style> <style>
:root { :root {
@@ -89,6 +89,8 @@
<a href="#aria-engine">AriaEngine 🆕</a> <a href="#aria-engine">AriaEngine 🆕</a>
<a href="#transaction">事务 & 回滚</a> <a href="#transaction">事务 & 回滚</a>
<a href="#subquery">子查询</a> <a href="#subquery">子查询</a>
<a href="#alter-table">ALTER TABLE 🆕</a>
<a href="#truncate">TRUNCATE TABLE 🆕</a>
<a href="#foreign-key">外键级联</a> <a href="#foreign-key">外键级联</a>
<a href="#connection-pool">连接池</a> <a href="#connection-pool">连接池</a>
<a href="#migration">数据迁移</a> <a href="#migration">数据迁移</a>
@@ -226,7 +228,14 @@ db.<span class="f">isReady</span>(); <span class="c">// true</span>
name STRING NOT NULL, name STRING NOT NULL,
price NUMBER DEFAULT 0 price NUMBER DEFAULT 0
)`</span>); )`</span>);
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'DROP TABLE products'</span>);</pre> <span class="k">await</span> db.<span class="f">query</span>(<span class="s">'DROP TABLE products'</span>);
<span class="c">-- ALTER TABLE — 动态修改表结构 (v0.2.5)</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users ADD COLUMN phone STRING'</span>);
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users DROP COLUMN phone'</span>);
<span class="c">-- TRUNCATE TABLE — 快速清空表数据 (v0.2.5)</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'TRUNCATE TABLE old_logs'</span>);</pre>
<h3>条件表达式</h3> <h3>条件表达式</h3>
<pre><span class="c">// 比较运算符</span> <pre><span class="c">// 比较运算符</span>
@@ -386,6 +395,45 @@ db.<span class="f">isReady</span>(); <span class="c">// true</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">`SELECT * FROM users <span class="k">await</span> db.<span class="f">query</span>(<span class="s">`SELECT * FROM users
WHERE id NOT IN (SELECT user_id FROM orders)`</span>);</pre> WHERE id NOT IN (SELECT user_id FROM orders)`</span>);</pre>
<h2 id="alter-table">🏗 ALTER TABLE (🆕 v0.2.5)</h2>
<p>v0.2.5 新增 ALTER TABLE 语法,支持动态添加和删除列。</p>
<h3>ADD COLUMN</h3>
<pre><span class="c">-- 添加新列</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users ADD COLUMN phone STRING'</span>);
<span class="c">-- 带约束的添加</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users ADD COLUMN email STRING UNIQUE'</span>);
<span class="c">-- 带可选 COLUMN 关键字</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users ADD COLUMN age NUMBER DEFAULT 0'</span>);</pre>
<h3>DROP COLUMN</h3>
<pre><span class="c">-- 删除列</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users DROP COLUMN phone'</span>);
<span class="c">-- 带可选 COLUMN 关键字</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'ALTER TABLE users DROP COLUMN email'</span>);</pre>
<table>
<tr><th>语法</th><th>说明</th></tr>
<tr><td><code>ALTER TABLE name ADD COLUMN col type [constraints]</code></td><td>添加列(COLUMN 可选)</td></tr>
<tr><td><code>ALTER TABLE name DROP COLUMN col</code></td><td>删除列(COLUMN 可选)</td></tr>
</table>
<h2 id="truncate">🗑 TRUNCATE TABLE (🆕 v0.2.5)</h2>
<p>v0.2.5 新增 TRUNCATE TABLE 语法,快速清空表数据(保留表结构)。</p>
<pre><span class="c">-- 快速清空表数据</span>
<span class="k">await</span> db.<span class="f">query</span>(<span class="s">'TRUNCATE TABLE old_logs'</span>);
<span class="c">-- 等价于 DELETE FROM old_logs,但语义更清晰</span></pre>
<table>
<tr><th>语法</th><th>说明</th></tr>
<tr><td><code>TRUNCATE TABLE name</code></td><td>清空表数据,保留表结构</td></tr>
</table>
<h2 id="foreign-key">🔗 外键级联</h2> <h2 id="foreign-key">🔗 外键级联</h2>
<p>v0.1.13 支持外键级联操作,定义表时可指定 ON DELETE / ON UPDATE 行为。</p> <p>v0.1.13 支持外键级联操作,定义表时可指定 ON DELETE / ON UPDATE 行为。</p>
@@ -613,7 +661,8 @@ db.<span class="f">emit</span>(<span class="s">'users'</span>, { <span class="s"
<tr><td><code>version</code></td><td><code>number</code></td><td><code>1</code></td><td>数据库版本号</td></tr> <tr><td><code>version</code></td><td><code>number</code></td><td><code>1</code></td><td>数据库版本号</td></tr>
<tr><td><code>plugins</code></td><td><code>MetonaPlugin[]</code></td><td><code>[]</code></td><td>初始插件列表</td></tr> <tr><td><code>plugins</code></td><td><code>MetonaPlugin[]</code></td><td><code>[]</code></td><td>初始插件列表</td></tr>
<tr><td><code>onReady</code></td><td><code>(db) => void</code></td><td>-</td><td>初始化完成回调</td></tr> <tr><td><code>onReady</code></td><td><code>(db) => void</code></td><td>-</td><td>初始化完成回调</td></tr>
<tr><td><code>onError</code></td><td><code>(err) => void</code></td><td>-</td><td>错误回调</td></tr> <tr><td><code>onError</code></td><td><code>(err) => void</code></td><td>-</td><td>错误回调v0.2.5 接入执行路径)</td></tr>
<tr><td><code>maxRowsPerQuery</code></td><td><code>number</code></td><td><code>0</code></td><td>查询结果行数上限(0=不限制)✅ v0.2.5 生效</td></tr>
</table> </table>
<h2 id="engine">💾 存储引擎</h2> <h2 id="engine">💾 存储引擎</h2>
@@ -624,12 +673,13 @@ db.<span class="f">emit</span>(<span class="s">'users'</span>, { <span class="s"
<tr><td><code>IndexedDBEngine</code></td><td>disk</td><td>✅ IDB</td><td>IDB 索引</td><td>延迟写入</td><td>通用持久化,兼容性最好</td></tr> <tr><td><code>IndexedDBEngine</code></td><td>disk</td><td>✅ IDB</td><td>IDB 索引</td><td>延迟写入</td><td>通用持久化,兼容性最好</td></tr>
<tr><td><code>OPFSEngine</code></td><td>disk</td><td>✅ OPFS</td><td>哈希</td><td>快照回滚</td><td>现代浏览器,文件级存储</td></tr> <tr><td><code>OPFSEngine</code></td><td>disk</td><td>✅ OPFS</td><td>哈希</td><td>快照回滚</td><td>现代浏览器,文件级存储</td></tr>
<tr><td><code>HybridEngine</code></td><td>hybrid</td><td>✅ Write-Through</td><td>哈希</td><td>双引擎代理</td><td>生产推荐,读写均走内存</td></tr> <tr><td><code>HybridEngine</code></td><td>hybrid</td><td>✅ Write-Through</td><td>哈希</td><td>双引擎代理</td><td>生产推荐,读写均走内存</td></tr>
<tr style="border-top:2px solid var(--primary);"><td><code style="color:#ec4899;font-weight:700;">AriaEngine 🆕</code></td><td>aria</td><td>✅ WAL + SSTable</td><td>LSM-Tree</td><td>MVCC 快照隔离</td><td>自研引擎:大表、高并发、需崩溃恢复</td></tr> <tr style="border-top:2px solid var(--primary);"><td><code style="color:#ec4899;font-weight:700;">AriaEngine</code></td><td>aria</td><td>✅ WAL + SSTable</td><td>LSM-Tree</td><td>MVCC 快照隔离</td><td>自研引擎:大表、高并发、需崩溃恢复</td></tr>
</table> </table>
<h2 id="aria-engine">🌲 AriaEngine 自研存储引擎</h2> <h2 id="aria-engine">🌲 AriaEngine 自研存储引擎</h2>
<p><strong>v0.2.0 新增</strong> — AriaEngine 是专为 MetonaSqlark 设计的页面式存储引擎,对标 SQLite 设计理念。<br> <p><strong>v0.2.0 新增</strong> — AriaEngine 是专为 MetonaSqlark 设计的页面式存储引擎,对标 SQLite 设计理念。<br>
<strong>v0.2.4 生产级</strong> — 二级索引 · MVCC · BloomFilter · WAL CRC全同步 · AES-GCM加密 · Savepoint · EXPLAIN · ANALYZE · REINDEX · VACUUM · BufferPool · 701测试 · 零死代码。</p> <strong>v0.2.4 生产级</strong> — 二级索引 · MVCC · BloomFilter · WAL CRC全同步 · AES-GCM加密 · Savepoint · EXPLAIN · ANALYZE · REINDEX · VACUUM · BufferPool · 701测试 · 零死代码。<br>
<strong>v0.2.5 质量加固</strong> — WAL full模式真正同步 · MVCC接入读写路径 · SSTableReader二分查找统一 · crypto实例化 · IndexedDB索引利用 · compactLevel public接口 · WAL大小阈值自动checkpoint · SQL注入防护 · ALTER TABLE · TRUNCATE TABLE · 721测试 37套件。</p>
<h3>存储模式对比</h3> <h3>存储模式对比</h3>
<table> <table>
@@ -647,9 +697,9 @@ db.<span class="f">emit</span>(<span class="s">'users'</span>, { <span class="s"
<tr><td><strong>LSM-Tree 索引</strong></td><td>MemTable (红黑树) + 多级 SSTable,写优化,支持范围扫描</td></tr> <tr><td><strong>LSM-Tree 索引</strong></td><td>MemTable (红黑树) + 多级 SSTable,写优化,支持范围扫描</td></tr>
<tr><td><strong>Slotted Page 格式</strong></td><td>4KB 固定页面,Slot Directory + Tuple 二进制序列化</td></tr> <tr><td><strong>Slotted Page 格式</strong></td><td>4KB 固定页面,Slot Directory + Tuple 二进制序列化</td></tr>
<tr><td><strong>Buffer Pool</strong></td><td>LRU 页面缓存,可控内存占用(默认 256 页 ≈ 1MB)</td></tr> <tr><td><strong>Buffer Pool</strong></td><td>LRU 页面缓存,可控内存占用(默认 256 页 ≈ 1MB)</td></tr>
<tr><td><strong>WAL 日志</strong></td><td>Write-Ahead Log 保证崩溃恢复,支持 full/batch/none 三种同步模式</td></tr> <tr><td><strong>WAL 日志</strong></td><td>Write-Ahead Log 保证崩溃恢复,支持 full/batch/none 三种同步模式full 模式真正同步 ✅ v0.2.5),16MB 阈值自动 checkpoint</td></tr>
<tr><td><strong>MVCC 事务</strong></td><td>快照隔离 (Snapshot Isolation),读写不互斥,版本链 + GC</td></tr> <tr><td><strong>MVCC 事务</strong></td><td>快照隔离 (Snapshot Isolation),读写不互斥,版本链 + GC,读写路径接入版本链 ✅ v0.2.5</td></tr>
<tr><td><strong>Bloom Filter</strong></td><td>快速判定 key 不存在,减少无效磁盘 I/O</td></tr> <tr><td><strong>Bloom Filter</strong></td><td>快速判定 key 不存在,减少无效磁盘 I/OSSTableReader 二分查找统一 ✅ v0.2.5</td></tr>
<tr><td><strong>LZ4 压缩</strong></td><td>可选页面级压缩,空间效率提升</td></tr> <tr><td><strong>LZ4 压缩</strong></td><td>可选页面级压缩,空间效率提升</td></tr>
</table> </table>
@@ -681,9 +731,10 @@ db.<span class="f">emit</span>(<span class="s">'users'</span>, { <span class="s"
<tr><td><code>levelSizeMultiplier</code></td><td><code>number</code></td><td><code>10</code></td><td>LSM 层级容量倍数</td></tr> <tr><td><code>levelSizeMultiplier</code></td><td><code>number</code></td><td><code>10</code></td><td>LSM 层级容量倍数</td></tr>
<tr><td><code>bloomFilterBitsPerKey</code></td><td><code>number</code></td><td><code>10</code></td><td>Bloom Filter 每 key 位数</td></tr> <tr><td><code>bloomFilterBitsPerKey</code></td><td><code>number</code></td><td><code>10</code></td><td>Bloom Filter 每 key 位数</td></tr>
<tr><td><code>walEnabled</code></td><td><code>boolean</code></td><td><code>true</code></td><td>是否启用 WAL</td></tr> <tr><td><code>walEnabled</code></td><td><code>boolean</code></td><td><code>true</code></td><td>是否启用 WAL</td></tr>
<tr><td><code>walSyncMode</code></td><td><code>'full'|'batch'|'none'</code></td><td><code>'batch'</code></td><td>WAL 同步策略</td></tr> <tr><td><code>walSyncMode</code></td><td><code>'full'|'batch'|'none'</code></td><td><code>'batch'</code></td><td>WAL 同步策略full 模式真正同步 ✅ v0.2.5</td></tr>
<tr><td><code>checkpointInterval</code></td><td><code>number</code></td><td><code>1000</code></td><td>Checkpoint 触发间隔(操作数)</td></tr> <tr><td><code>checkpointInterval</code></td><td><code>number</code></td><td><code>1000</code></td><td>Checkpoint 触发间隔(操作数)</td></tr>
<tr><td><code>compression</code></td><td><code>boolean</code></td><td><code>false</code></td><td>是否启用页面压缩</td></tr> <tr><td><code>walSizeThreshold</code></td><td><code>number</code></td><td><code>16777216</code></td><td>WAL 大小阈值(字节),超阈值触发 checkpoint ✅ v0.2.5</td></tr>
<tr><td><code>compression</code></td><td><code>boolean</code></td><td><code>false</code></td><td>是否启用页面压缩</td></tr>
<tr><td><code>storageBackend</code></td><td><code>'indexeddb'|'opfs'|'memory'</code></td><td><code>'indexeddb'</code></td><td>存储后端类型</td></tr> <tr><td><code>storageBackend</code></td><td><code>'indexeddb'|'opfs'|'memory'</code></td><td><code>'indexeddb'</code></td><td>存储后端类型</td></tr>
</table> </table>
+18 -18
View File
@@ -152,9 +152,9 @@
<!-- Hero --> <!-- Hero -->
<section class="hero"> <section class="hero">
<div class="container"> <div class="container">
<div class="badge" style="margin-bottom:24px;"><span class="dot"></span> v0.2.4 生产级 — 701测试 32套件 · 五模式全覆盖 · AriaEngine 25项生产加固 · 零死代码</div> <div class="badge" style="margin-bottom:24px;"><span class="dot"></span> v0.2.5 质量加固 — 721测试 37套件 · 五模式全覆盖 · WAL同步修复 · ALTER/TRUNCATE · SQL注入防护 · 零回归</div>
<h1>前端的 <span class="gradient-text">SQL 数据库</span></h1> <h1>前端的 <span class="gradient-text">SQL 数据库</span></h1>
<p>TypeScript 原生构建,5 种存储引擎,支持完整 SQL 查询。<br>零运行时依赖,开箱即用。AriaEngine 自研引擎:LSM-Tree + WAL + MVCC。</p> <p>TypeScript 原生构建,5 种存储引擎,支持完整 SQL 查询。<br>零运行时依赖,开箱即用。AriaEngine 自研引擎:LSM-Tree + WAL 同步 + MVCC。</p>
<div class="actions"> <div class="actions">
<a href="demo.html" class="btn btn-primary" style="font-size:1.05rem;padding:14px 32px;">▶ 在线演示</a> <a href="demo.html" class="btn btn-primary" style="font-size:1.05rem;padding:14px 32px;">▶ 在线演示</a>
<a href="docs.html" class="btn btn-outline" style="font-size:1.05rem;padding:14px 32px;">📖 API 文档</a> <a href="docs.html" class="btn btn-outline" style="font-size:1.05rem;padding:14px 32px;">📖 API 文档</a>
@@ -233,37 +233,37 @@ npm install @metona-team/metona-sqlark
<div class="feature-card"> <div class="feature-card">
<div class="icon">🧠</div> <div class="icon">🧠</div>
<h3>5 种存储引擎</h3> <h3>5 种存储引擎</h3>
<p>Memory / IndexedDB / OPFS / Hybrid / <strong>AriaEngine</strong> 🆕。Aria 是自研 LSM-Tree 页面式引擎,支持 WAL 崩溃恢复和 MVCC 事务隔离。</p> <p>Memory / IndexedDB / OPFS / Hybrid / <strong>AriaEngine</strong>。Aria 是自研 LSM-Tree 页面式引擎,支持 WAL 同步崩溃恢复和 MVCC 事务隔离。</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon"></div> <div class="icon"></div>
<h3>完整 SQL 解析器</h3> <h3>完整 SQL 解析器</h3>
<p>手写递归下降 SQL 解析器。SELECT / INSERT / UPDATE / DELETE / JOIN / GROUP BY / HAVING / DISTINCT / 子查询。</p> <p>手写递归下降 SQL 解析器。SELECT / INSERT / UPDATE / DELETE / JOIN / GROUP BY / HAVING / DISTINCT / 子查询 / ALTER TABLE / TRUNCATE TABLE</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🌲</div> <div class="icon">🌲</div>
<h3>AriaEngine <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">NEW</span></h3> <h3>AriaEngine <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">v0.2.5</span></h3>
<p>自研 LSM-Tree 页面式存储引擎。MemTable 红黑树 + 多级 SSTable、Bloom Filter 快速判存、WAL 崩溃恢复、MVCC 快照隔离</p> <p>自研 LSM-Tree 页面式存储引擎。MemTable 红黑树 + 多级 SSTable、Bloom Filter 快速判存、WAL full模式真正同步、MVCC 版本链接入读写路径</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🔒</div> <div class="icon">🔒</div>
<h3>事务回滚 <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">NEW</span></h3> <h3>事务回滚 + MVCC</h3>
<p>beginTransaction / commitTransaction / rollbackTransaction 三件套。失败自动回滚,Memory 快照 + IndexedDB 延迟写入。</p> <p>beginTransaction / commitTransaction / rollbackTransaction 三件套。失败自动回滚,Memory 快照 + IndexedDB 延迟写入 + Aria MVCC 版本链</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🔍</div> <div class="icon">🔍</div>
<h3>子查询 <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">NEW</span></h3> <h3>子查询 + ALTER TABLE</h3>
<p>IN (SELECT ...) + 标量子查询。递归执行,自动将子查询结果替换为具体值</p> <p>IN (SELECT ...) + 标量子查询。ALTER TABLE ADD/DROP COLUMN 动态修改表结构,TRUNCATE TABLE 快速清空</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🔗</div> <div class="icon">🔗</div>
<h3>外键级联 <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">NEW</span></h3> <h3>外键级联 + SQL安全</h3>
<p>references + ON DELETE CASCADE / SET NULL / RESTRICT。递归级联删除,自动维护引用完整性</p> <p>references + ON DELETE CASCADE / SET NULL / RESTRICT。React/Vue hooks 表名合法性校验,防 SQL 注入</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🏊</div> <div class="icon">🏊</div>
<h3>连接池 <span style="font-size:0.65rem;color:var(--accent);vertical-align:super;">NEW</span></h3> <h3>连接池 + 性能优化</h3>
<p>MetonaSqlark.connect() 单例复用,引用计数管理。避免重复打开 IndexedDB,自动释放资源</p> <p>MetonaSqlark.connect() 单例复用。SSTableReader 二分查找统一、IndexedDB 索引利用、crypto 实例化</p>
</div> </div>
<div class="feature-card"> <div class="feature-card">
<div class="icon">🧩</div> <div class="icon">🧩</div>
@@ -333,7 +333,7 @@ npm install @metona-team/metona-sqlark
<div class="container"> <div class="container">
<div class="section-title"> <div class="section-title">
<h2>5 行<span>代码</span>开始</h2> <h2>5 行<span>代码</span>开始</h2>
<p>SQL + Query Builder 双 API — JOIN · 子查询 · 聚合 · 事务回滚 · 外键级联 · 连接池 · AriaEngine</p> <p>SQL + Query Builder 双 API — JOIN · 子查询 · 聚合 · 事务回滚 · 外键级联 · 连接池 · AriaEngine · ALTER TABLE · TRUNCATE</p>
</div> </div>
<div class="code-block"> <div class="code-block">
<pre><span class="comment">// 创建数据库 — MeSqlark 是别名,完全等价</span> <pre><span class="comment">// 创建数据库 — MeSqlark 是别名,完全等价</span>
@@ -393,12 +393,12 @@ npm install @metona-team/metona-sqlark
<p>MetonaSqlark 的核心指标</p> <p>MetonaSqlark 的核心指标</p>
</div> </div>
<div class="stats"> <div class="stats">
<div class="stat-card"><div class="num">701</div><div class="label">测试用例</div></div> <div class="stat-card"><div class="num">721</div><div class="label">测试用例</div></div>
<div class="stat-card"><div class="num">91.0%</div><div class="label">行覆盖率</div></div> <div class="stat-card"><div class="num">91.0%</div><div class="label">行覆盖率</div></div>
<div class="stat-card"><div class="num">~10KB</div><div class="label">gzip 体积</div></div> <div class="stat-card"><div class="num">~10KB</div><div class="label">gzip 体积</div></div>
<div class="stat-card"><div class="num">5</div><div class="label">存储引擎</div></div> <div class="stat-card"><div class="num">5</div><div class="label">存储引擎</div></div>
<div class="stat-card"><div class="num">33</div><div class="label">SQL 关键字</div></div> <div class="stat-card"><div class="num">36</div><div class="label">SQL 关键字</div></div>
<div class="stat-card"><div class="num">32</div><div class="label">测试套件</div></div> <div class="stat-card"><div class="num">37</div><div class="label">测试套件</div></div>
</div> </div>
</div> </div>
</section> </section>
+2 -2
View File
@@ -89,7 +89,7 @@ export interface DatabaseConfig {
onReady?: (db: unknown) => void; onReady?: (db: unknown) => void;
/** 错误回调 */ /** 错误回调 */
onError?: (error: Error) => void; onError?: (error: Error) => void;
/** 查询结果行数上限(默认 100000 表示不限制) */ /** 查询结果行数上限(默认 0,0 表示不限制) */
maxRowsPerQuery?: number; maxRowsPerQuery?: number;
/** 调试模式(启用后输出详细操作日志) */ /** 调试模式(启用后输出详细操作日志) */
debug?: boolean; debug?: boolean;
@@ -209,4 +209,4 @@ export class DatabaseError extends Error {
// 版本 // 版本
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
export const VERSION = '0.2.0'; export const VERSION = '0.2.5';
+41 -15
View File
@@ -72,13 +72,13 @@ export class MetonaSqlark {
await this.engine.open(this.name, this.version); await this.engine.open(this.name, this.version);
// 初始化执行器和事务管理器 // 初始化执行器和事务管理器
this.executor = new QueryExecutor(this.engine); this.executor = new QueryExecutor(this.engine, this.maxRowsPerQuery);
this.transactionManager = new TransactionManager(this.engine); this.transactionManager = new TransactionManager(this.engine);
// 注册插件 // 注册插件
if (this.config.plugins) { if (this.config.plugins) {
for (const plugin of this.config.plugins) { for (const plugin of this.config.plugins) {
this.pluginManager.register(plugin); this.pluginManager.register(plugin, this);
} }
} }
@@ -102,9 +102,14 @@ export class MetonaSqlark {
this.ensureReady(); this.ensureReady();
const schema = createSchema(name, columns); const schema = createSchema(name, columns);
await this.pluginManager.trigger('beforeCreateTable', schema); try {
await this.engine.createTable(schema); await this.pluginManager.trigger('beforeCreateTable', schema);
await this.pluginManager.trigger('afterCreateTable', schema); await this.engine.createTable(schema);
await this.pluginManager.trigger('afterCreateTable', schema);
} catch (error) {
this._onError(error as Error);
throw error;
}
// 清除缓存 // 清除缓存
this.tableCache.delete(name); this.tableCache.delete(name);
@@ -125,9 +130,14 @@ export class MetonaSqlark {
/** 删除表 */ /** 删除表 */
async dropTable(name: string): Promise<void> { async dropTable(name: string): Promise<void> {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeDropTable', name); try {
await this.engine.dropTable(name); await this.pluginManager.trigger('beforeDropTable', name);
await this.pluginManager.trigger('afterDropTable', name); await this.engine.dropTable(name);
await this.pluginManager.trigger('afterDropTable', name);
} catch (error) {
this._onError(error as Error);
throw error;
}
this.tableCache.delete(name); this.tableCache.delete(name);
} }
@@ -146,8 +156,14 @@ export class MetonaSqlark {
await this.pluginManager.trigger('beforeQuery', sql); await this.pluginManager.trigger('beforeQuery', sql);
const stmt: Statement = parse(sql); let result: unknown;
const result = await this.executor.execute(stmt); try {
const stmt: Statement = parse(sql);
result = await this.executor.execute(stmt);
} catch (error) {
this._onError(error as Error);
throw error;
}
await this.pluginManager.trigger('afterQuery', sql, result); await this.pluginManager.trigger('afterQuery', sql, result);
@@ -166,9 +182,14 @@ export class MetonaSqlark {
async transaction<T>(fn: (trx: import('./transaction/index').Transaction) => Promise<T>): Promise<T> { async transaction<T>(fn: (trx: import('./transaction/index').Transaction) => Promise<T>): Promise<T> {
this.ensureReady(); this.ensureReady();
await this.pluginManager.trigger('beforeTransaction'); await this.pluginManager.trigger('beforeTransaction');
const result = await this.transactionManager.execute(fn); try {
await this.pluginManager.trigger('afterTransaction'); const result = await this.transactionManager.execute(fn);
return result; await this.pluginManager.trigger('afterTransaction');
return result;
} catch (error) {
this._onError(error as Error);
throw error;
}
} }
// ---- 导入导出 ---- // ---- 导入导出 ----
@@ -182,7 +203,12 @@ export class MetonaSqlark {
/** 导入 JSON 数据到表 */ /** 导入 JSON 数据到表 */
async importTable(tableName: string, data: Record<string, unknown>[]): Promise<string[]> { async importTable(tableName: string, data: Record<string, unknown>[]): Promise<string[]> {
this.ensureReady(); this.ensureReady();
return this.engine.insert(tableName, data); try {
return await this.engine.insert(tableName, data);
} catch (error) {
this._onError(error as Error);
throw error;
}
} }
/** 导出整个数据库为 JSON */ /** 导出整个数据库为 JSON */
@@ -273,7 +299,7 @@ export class MetonaSqlark {
case 'disk': case 'disk':
return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine(); return diskEngine === 'opfs' ? new OPFSEngine() : new IndexedDBEngine();
case 'aria': case 'aria':
return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'memory' : 'indexeddb' }); return new AriaEngine({ storageBackend: diskEngine === 'opfs' ? 'opfs' : 'indexeddb' });
case 'hybrid': case 'hybrid':
return new HybridEngine(diskEngine); return new HybridEngine(diskEngine);
default: default:
+60 -23
View File
@@ -2,43 +2,80 @@
* AriaEngine Crypto AES-GCM * AriaEngine Crypto AES-GCM
* @module engine/aria/crypto * @module engine/aria/crypto
* *
* 使 Web Crypto API (SubtleCrypto) AES-256-GCM * v0.2.5: 改为实例化 CryptoManager
*
*/ */
const ALGO = 'AES-GCM'; const ALGO = 'AES-GCM';
const IV_LENGTH = 12; const IV_LENGTH = 12;
let cryptoKey: CryptoKey | null = null; /**
let enabled = false; * CryptoManager
* AriaEngine
*/
export class CryptoManager {
private cryptoKey: CryptoKey | null = null;
private _enabled = false;
get enabled(): boolean { return this._enabled; }
async init(password: string, salt?: Uint8Array): Promise<Uint8Array> {
const enc = new TextEncoder();
const keyMaterial = await crypto.subtle.importKey(
'raw', enc.encode(password), 'PBKDF2', false, ['deriveKey'],
);
const actualSalt: any = salt || crypto.getRandomValues(new Uint8Array(16));
this.cryptoKey = await crypto.subtle.deriveKey(
{ name: 'PBKDF2', salt: actualSalt, iterations: 100000, hash: 'SHA-256' } as any,
keyMaterial, { name: ALGO, length: 256 } as any, false, ['encrypt', 'decrypt'],
);
this._enabled = true;
return actualSalt as Uint8Array;
}
async encryptPage(data: ArrayBuffer): Promise<{ iv: Uint8Array; data: ArrayBuffer }> {
if (!this.cryptoKey) throw new Error('Crypto not initialized');
const iv = crypto.getRandomValues(new Uint8Array(IV_LENGTH)) as any;
const ciphertext = await crypto.subtle.encrypt({ name: ALGO, iv } as any, this.cryptoKey, data);
return { iv: iv as Uint8Array, data: ciphertext };
}
async decryptPage(iv: Uint8Array, data: ArrayBuffer): Promise<ArrayBuffer> {
if (!this.cryptoKey) throw new Error('Crypto not initialized');
return crypto.subtle.decrypt({ name: ALGO, iv } as any, this.cryptoKey, data);
}
close(): void {
this.cryptoKey = null;
this._enabled = false;
}
}
// ---------------------------------------------------------------------------
// 全局兼容层(旧代码仍可使用全局函数)
// ---------------------------------------------------------------------------
const globalCrypto = new CryptoManager();
/** @deprecated 使用 CryptoManager 实例代替 */
export async function initCrypto(password: string, salt?: Uint8Array): Promise<Uint8Array> { export async function initCrypto(password: string, salt?: Uint8Array): Promise<Uint8Array> {
const enc = new TextEncoder(); return globalCrypto.init(password, salt);
const keyMaterial = await crypto.subtle.importKey(
'raw', enc.encode(password), 'PBKDF2', false, ['deriveKey'],
);
const actualSalt: any = salt || crypto.getRandomValues(new Uint8Array(16));
cryptoKey = await crypto.subtle.deriveKey(
{ name: 'PBKDF2', salt: actualSalt, iterations: 100000, hash: 'SHA-256' } as any,
keyMaterial, { name: ALGO, length: 256 } as any, false, ['encrypt', 'decrypt'],
);
enabled = true;
return actualSalt as Uint8Array;
} }
export function isCryptoEnabled(): boolean { return enabled; } /** @deprecated 使用 CryptoManager 实例代替 */
export function isCryptoEnabled(): boolean { return globalCrypto.enabled; }
/** @deprecated 使用 CryptoManager 实例代替 */
export async function encryptPage(data: ArrayBuffer): Promise<{ iv: Uint8Array; data: ArrayBuffer }> { export async function encryptPage(data: ArrayBuffer): Promise<{ iv: Uint8Array; data: ArrayBuffer }> {
if (!cryptoKey) throw new Error('Crypto not initialized'); return globalCrypto.encryptPage(data);
const iv = crypto.getRandomValues(new Uint8Array(IV_LENGTH)) as any;
const ciphertext = await crypto.subtle.encrypt({ name: ALGO, iv } as any, cryptoKey, data);
return { iv: iv as Uint8Array, data: ciphertext };
} }
/** @deprecated 使用 CryptoManager 实例代替 */
export async function decryptPage(iv: Uint8Array, data: ArrayBuffer): Promise<ArrayBuffer> { export async function decryptPage(iv: Uint8Array, data: ArrayBuffer): Promise<ArrayBuffer> {
if (!cryptoKey) throw new Error('Crypto not initialized'); return globalCrypto.decryptPage(iv, data);
return crypto.subtle.decrypt({ name: ALGO, iv } as any, cryptoKey, data);
} }
/** @deprecated 使用 CryptoManager 实例代替 */
export function closeCrypto(): void { export function closeCrypto(): void {
cryptoKey = null; globalCrypto.close();
enabled = false;
} }
+23 -13
View File
@@ -2,7 +2,7 @@
* AriaEngine * AriaEngine
* @module engine/aria/index * @module engine/aria/index
* *
* v0.2.4: 二级索引 + MVCC + * v0.2.5: WAL + MVCC + +
*/ */
import type { IStorageEngine } from '../interface'; import type { IStorageEngine } from '../interface';
@@ -27,6 +27,7 @@ import { BloomFilter } from './index/bloom';
import { BufferPool } from './buffer/pool'; import { BufferPool } from './buffer/pool';
import { compressLZ4, decompressLZ4 } from './compression/lz4'; import { compressLZ4, decompressLZ4 } from './compression/lz4';
import { isCryptoEnabled, encryptPage, decryptPage } from './crypto'; import { isCryptoEnabled, encryptPage, decryptPage } from './crypto';
import type { WALRecord as _WALRecord } from './types';
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AriaEngine // AriaEngine
@@ -163,12 +164,13 @@ export class AriaEngine implements IStorageEngine {
} }
} }
// 8. Checkpoint ManagerBufferPool 暂简化,使用 flush 替代 // 8. Checkpoint Manager接入 WAL 大小阈值
this.checkpointManager = new CheckpointManager( this.checkpointManager = new CheckpointManager(
this.lsm, this.lsm,
this.wal, this.wal,
{ flushAll: async () => { await this.lsm.flush(); } } as any, { flushAll: async () => { await this.lsm.flush(); } } as any,
this.config.checkpointInterval, this.config.checkpointInterval,
this.config.walSizeThreshold,
); );
this.opened = true; this.opened = true;
@@ -220,7 +222,7 @@ export class AriaEngine implements IStorageEngine {
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.CREATE_TABLE, type: WALRecordType.CREATE_TABLE,
txnId: 0, txnId: 0,
tableName: schema.name, tableName: schema.name,
@@ -244,7 +246,7 @@ export class AriaEngine implements IStorageEngine {
this.tablePKs.delete(tableName); this.tablePKs.delete(tableName);
await this.persistSchemas(); await this.persistSchemas();
this.wal.append({ await this.wal.append({
type: WALRecordType.DROP_TABLE, type: WALRecordType.DROP_TABLE,
txnId: 0, txnId: 0,
tableName, tableName,
@@ -293,8 +295,9 @@ export class AriaEngine implements IStorageEngine {
} }
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Within transaction: buffer to snapshot // Within transaction: buffer to snapshot + MVCC version chain
this.txnSnapshot.set(key, validated); this.txnSnapshot.set(key, validated);
this.mvcc.writeVersion(tableName, pkValue, validated, this.currentTxnId);
} else { } else {
// Direct write to LSM (PK index) // Direct write to LSM (PK index)
this.lsm.put(key, validated); this.lsm.put(key, validated);
@@ -305,7 +308,7 @@ export class AriaEngine implements IStorageEngine {
pks.push(pkValue); pks.push(pkValue);
this.wal.append({ await this.wal.append({
type: WALRecordType.INSERT, type: WALRecordType.INSERT,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -399,12 +402,13 @@ export class AriaEngine implements IStorageEngine {
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
this.txnSnapshot.set(key, updated); this.txnSnapshot.set(key, updated);
this.mvcc.writeVersion(tableName, String(row[pkCol]), updated, this.currentTxnId);
} else { } else {
this.lsm.put(key, updated); this.lsm.put(key, updated);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.UPDATE, type: WALRecordType.UPDATE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -435,14 +439,15 @@ export class AriaEngine implements IStorageEngine {
if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) { if (!query.where || Object.keys(query.where).length === 0 || matchWhere(row, query.where)) {
if (this.currentTxnId && this.txnSnapshot) { if (this.currentTxnId && this.txnSnapshot) {
// Buffer delete in snapshot // Buffer delete in snapshot + MVCC tombstone
this.txnSnapshot.set(key, { __txn_deleted: true } as unknown as Record<string, unknown>); this.txnSnapshot.set(key, { __txn_deleted: true } as unknown as Record<string, unknown>);
this.mvcc.deleteVersion(tableName, String(row[pkCol]), this.currentTxnId);
} else { } else {
this.lsm.delete(key); this.lsm.delete(key);
} }
count++; count++;
this.wal.append({ await this.wal.append({
type: WALRecordType.DELETE, type: WALRecordType.DELETE,
txnId: this.currentTxnId ?? 0, txnId: this.currentTxnId ?? 0,
tableName, tableName,
@@ -486,7 +491,7 @@ export class AriaEngine implements IStorageEngine {
this.currentTxnId = this.mvcc.beginTransaction(); this.currentTxnId = this.mvcc.beginTransaction();
this.txnSnapshot = new Map(); this.txnSnapshot = new Map();
this.wal.append({ await this.wal.append({
type: WALRecordType.BEGIN, type: WALRecordType.BEGIN,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -509,7 +514,7 @@ export class AriaEngine implements IStorageEngine {
this.mvcc.commitTransaction(this.currentTxnId); this.mvcc.commitTransaction(this.currentTxnId);
this.wal.append({ await this.wal.append({
type: WALRecordType.COMMIT, type: WALRecordType.COMMIT,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -527,7 +532,7 @@ export class AriaEngine implements IStorageEngine {
this.mvcc.rollbackTransaction(this.currentTxnId); this.mvcc.rollbackTransaction(this.currentTxnId);
this.txnSnapshot = null; this.txnSnapshot = null;
this.wal.append({ await this.wal.append({
type: WALRecordType.ROLLBACK, type: WALRecordType.ROLLBACK,
txnId: this.currentTxnId, txnId: this.currentTxnId,
tableName: '', tableName: '',
@@ -922,6 +927,11 @@ export class AriaEngine implements IStorageEngine {
} }
} }
/** 估算 WAL 大小(字节) */
getWALEstimatedSize(): number {
return this.wal.getBufferedCount() * 200; // 粗略估算每条 ~200B
}
/** /**
* ANALYZE: 收集表统计信息 * ANALYZE: 收集表统计信息
* *
@@ -997,7 +1007,7 @@ export class AriaEngine implements IStorageEngine {
// 压缩各层级 // 压缩各层级
for (let level = 0; level < 6; level++) { for (let level = 0; level < 6; level++) {
if (this.lsm.getStats().levelCounts[level] >= 2) { if (this.lsm.getStats().levelCounts[level] >= 2) {
(this.lsm as any).compactLevelSync(level); this.lsm.compactLevel(level);
} }
} }
// GC MVCC 版本(保留最新 10 个) // GC MVCC 版本(保留最新 10 个)
+6 -1
View File
@@ -331,7 +331,12 @@ export class LSM {
// Compaction // Compaction
// ======================================================================= // =======================================================================
/** 同步执行 Compaction简化版,仅供内部调用) */ /** 同步执行 Compactionpublic,供 VACUUM 等外部调用) */
compactLevel(level: number): void {
this.compactLevelSync(level);
}
/** 同步执行 Compaction(简化版,内部实现) */
private compactLevelSync(level: number): void { private compactLevelSync(level: number): void {
if (level >= MAX_LSM_LEVELS - 1) return; if (level >= MAX_LSM_LEVELS - 1) return;
if (this.levels[level].length < 4) return; if (this.levels[level].length < 4) return;
+12 -6
View File
@@ -240,16 +240,22 @@ export class SSTableReader {
} }
private locateBlockGE(key: string): number { private locateBlockGE(key: string): number {
for (let i = 0; i < this.indexEntries.length; i++) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key >= key) return i; while (lo < hi) {
const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key < key) lo = mid + 1;
else hi = mid;
} }
return this.indexEntries.length - 1; return lo < this.indexEntries.length ? lo : this.indexEntries.length - 1;
} }
private locateBlockLE(key: string): number { private locateBlockLE(key: string): number {
for (let i = this.indexEntries.length - 1; i >= 0; i--) { let lo = 0, hi = this.indexEntries.length;
if (this.indexEntries[i].key <= key) return i; while (lo < hi) {
const mid = (lo + hi) >> 1;
if (this.indexEntries[mid].key <= key) lo = mid + 1;
else hi = mid;
} }
return 0; return lo > 0 ? lo - 1 : 0;
} }
} }
+11 -1
View File
@@ -24,26 +24,36 @@ export class CheckpointManager {
private flushable: Flushable | null; private flushable: Flushable | null;
private interval: number; private interval: number;
private opCount = 0; private opCount = 0;
private walSizeThreshold: number;
constructor( constructor(
lsm: LSM, lsm: LSM,
wal: WAL, wal: WAL,
flushable: Flushable | null = null, flushable: Flushable | null = null,
interval: number = 1000, interval: number = 1000,
walSizeThreshold: number = 16 * 1024 * 1024,
) { ) {
this.lsm = lsm; this.lsm = lsm;
this.wal = wal; this.wal = wal;
this.flushable = flushable; this.flushable = flushable;
this.interval = interval; this.interval = interval;
this.walSizeThreshold = walSizeThreshold;
} }
async tick(): Promise<void> { async tick(): Promise<void> {
this.opCount++; this.opCount++;
if (this.opCount >= this.interval) { // 检查操作计数或 WAL 大小是否超阈值
if (this.opCount >= this.interval || this.getWALEstimatedSize() >= this.walSizeThreshold) {
await this.checkpoint(); await this.checkpoint();
} }
} }
/** 估算 WAL 大小 */
private getWALEstimatedSize(): number {
const count = typeof this.wal.getBufferedCount === 'function' ? this.wal.getBufferedCount() : 0;
return count * 200;
}
async checkpoint(): Promise<void> { async checkpoint(): Promise<void> {
await this.lsm.flush(); await this.lsm.flush();
if (this.flushable) { if (this.flushable) {
+6 -4
View File
@@ -59,8 +59,8 @@ export class WAL {
// 写入 // 写入
// ======================================================================= // =======================================================================
/** 追加一条 WAL 记录 */ /** 追加一条 WAL 记录full 模式同步等待写入完成) */
append(record: Omit<WALRecord, 'lsn' | 'checksum'>): void { async append(record: Omit<WALRecord, 'lsn' | 'checksum'>): Promise<void> {
if (!this.enabled) return; if (!this.enabled) return;
this.lsn++; this.lsn++;
@@ -73,10 +73,12 @@ export class WAL {
const bytes = this.encodeRecord(fullRecord); const bytes = this.encodeRecord(fullRecord);
if (this.syncMode === 'full') { if (this.syncMode === 'full') {
this.store.append(bytes).catch(() => { try {
await this.store.append(bytes);
} catch {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
console.warn('[AriaEngine WAL] Failed to append record'); console.warn('[AriaEngine WAL] Failed to append record');
}); }
} else if (this.syncMode === 'batch') { } else if (this.syncMode === 'batch') {
this.buffer.push(bytes); this.buffer.push(bytes);
} }
+71
View File
@@ -187,6 +187,14 @@ export class IndexedDBEngine implements IStorageEngine {
private async idbFind(tableName: string, query: QueryPlan): Promise<Record<string, unknown>[]> { private async idbFind(tableName: string, query: QueryPlan): Promise<Record<string, unknown>[]> {
const db = this.ensureDB(); const db = this.ensureDB();
// 尝试使用 IDB 索引进行等值查询
if (query.where) {
const indexResult = await this.tryIDBIndexLookup(db, tableName, query);
if (indexResult !== null) return indexResult;
}
// 回退到全量 getAll + 内存过滤
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly'); const tx = db.transaction(tableName, 'readonly');
const req = tx.objectStore(tableName).getAll(); const req = tx.objectStore(tableName).getAll();
@@ -210,6 +218,69 @@ export class IndexedDBEngine implements IStorageEngine {
}); });
} }
/** 尝试使用 IDB 索引进行等值查询,成功返回结果,不适用返回 null */
private async tryIDBIndexLookup(
db: IDBDatabase,
tableName: string,
query: QueryPlan,
): Promise<Record<string, unknown>[] | null> {
if (!query.where) return null;
for (const [col, condition] of Object.entries(query.where)) {
// 跳过逻辑组合符
if (col === '$and' || col === '$or' || col === '$not') continue;
// 只处理等值查询
let targetValue: unknown;
if (typeof condition !== 'object' || condition === null) {
targetValue = condition;
} else if ('$eq' in (condition as Record<string, unknown>)) {
targetValue = (condition as Record<string, unknown>).$eq;
} else {
continue;
}
// 检查是否有对应的 IDB 索引
const indexName = `idx_${col}`;
try {
return await new Promise((resolve, reject) => {
const tx = db.transaction(tableName, 'readonly');
const store = tx.objectStore(tableName);
if (!store.indexNames.contains(indexName)) {
resolve(null); // 没有索引,回退
return;
}
const index = store.index(indexName);
const req = index.getAll(targetValue as IDBValidKey);
req.onsuccess = () => {
let results: Record<string, unknown>[] = req.result ?? [];
// 如果有其他 WHERE 条件,继续过滤
const otherKeys = Object.keys(query.where!).filter(
(k) => k !== col && k !== '$and' && k !== '$or' && k !== '$not',
);
if (otherKeys.length > 0) {
results = results.filter((row) => matchWhere(row, query.where!));
}
if (query.orderBy && query.orderBy.length > 0) {
results = applyOrderBy(results, query.orderBy);
}
const offset = query.offset ?? 0;
const limit = query.limit ?? results.length;
results = results.slice(offset, offset + limit);
if (query.columns && query.columns.length > 0 && query.columns[0] !== '*') {
results = results.map((r) => projectColumns(r, query.columns!));
}
resolve(results);
};
req.onerror = () => reject(new DatabaseError(`Index lookup failed for "${tableName}.${col}"`, 'IDB_READ_ERROR', req.error));
});
} catch {
return null; // 索引不可用,回退
}
}
return null;
}
private async idbUpdate(tableName: string, query: QueryPlan, updates: Record<string, unknown>): Promise<void> { private async idbUpdate(tableName: string, query: QueryPlan, updates: Record<string, unknown>): Promise<void> {
const db = this.ensureDB(); const db = this.ensureDB();
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
+1 -1
View File
@@ -1,7 +1,7 @@
/** /**
* metona-sqlark * metona-sqlark
* @module metona-sqlark * @module metona-sqlark
* @version 0.1.12 * @version 0.2.5
* *
* *
* Query Builder API SQL * Query Builder API SQL
+10 -2
View File
@@ -1,6 +1,6 @@
// @ts-nocheck // @ts-nocheck
/** /**
* metona-sqlark React Integration (v0.1.11) * metona-sqlark React Integration (v0.2.5)
* @module integrations/react * @module integrations/react
* *
* React hooks react peer dependency * React hooks react peer dependency
@@ -46,12 +46,20 @@ export function useQuery(
return { data, loading, error, refresh: execute }; return { data, loading, error, refresh: execute };
} }
/** 表名合法性校验(防 SQL 注入) */
function validateTableName(name: string): string {
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) {
throw new Error(`Invalid table name: "${name}"`);
}
return name;
}
/** useTable: 快速获取表数据 */ /** useTable: 快速获取表数据 */
export function useTable( export function useTable(
db: MetonaSqlark, db: MetonaSqlark,
tableName: string, tableName: string,
): { data: Record<string, unknown>[]; loading: boolean; refresh: () => void } { ): { data: Record<string, unknown>[]; loading: boolean; refresh: () => void } {
const { data, loading, refresh } = useQuery(db, `SELECT * FROM ${tableName}`, [tableName]); const { data, loading, refresh } = useQuery(db, `SELECT * FROM ${validateTableName(tableName)}`, [tableName]);
return { data, loading, refresh }; return { data, loading, refresh };
} }
+10 -2
View File
@@ -1,6 +1,6 @@
// @ts-nocheck // @ts-nocheck
/** /**
* metona-sqlark Vue Integration (v0.1.11) * metona-sqlark Vue Integration (v0.2.5)
* @module integrations/vue * @module integrations/vue
* *
* Vue composables vue peer dependency * Vue composables vue peer dependency
@@ -43,12 +43,20 @@ export function useSqlarkQuery(
return { data, loading, error, refresh: execute }; return { data, loading, error, refresh: execute };
} }
/** 表名合法性校验(防 SQL 注入) */
function validateTableName(name: string): string {
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name)) {
throw new Error(`Invalid table name: "${name}"`);
}
return name;
}
/** useSqlarkTable: 快速获取表数据 */ /** useSqlarkTable: 快速获取表数据 */
export function useSqlarkTable( export function useSqlarkTable(
db: MetonaSqlark, db: MetonaSqlark,
tableName: string, tableName: string,
): { data: Ref<Record<string, unknown>[]>; loading: Ref<boolean>; refresh: () => void } { ): { data: Ref<Record<string, unknown>[]>; loading: Ref<boolean>; refresh: () => void } {
const { data, loading, refresh } = useSqlarkQuery(db, `SELECT * FROM ${tableName}`); const { data, loading, refresh } = useSqlarkQuery(db, `SELECT * FROM ${validateTableName(tableName)}`);
return { data, loading, refresh }; return { data, loading, refresh };
} }
+3 -3
View File
@@ -22,7 +22,7 @@ export class PluginManager {
private hooks: Map<HookName, HookCallback[]> = new Map(); private hooks: Map<HookName, HookCallback[]> = new Map();
/** 注册插件 */ /** 注册插件 */
register(plugin: MetonaPlugin): void { register(plugin: MetonaPlugin, db?: unknown): void {
// 按优先级插入 // 按优先级插入
const priority = plugin.priority ?? 0; const priority = plugin.priority ?? 0;
const insertIndex = this.plugins.findIndex( const insertIndex = this.plugins.findIndex(
@@ -33,8 +33,8 @@ export class PluginManager {
} else { } else {
this.plugins.splice(insertIndex, 0, plugin); this.plugins.splice(insertIndex, 0, plugin);
} }
// 安装 // 安装(传入 db 实例)
plugin.install(null); // 实际引用由 MetonaSqlark 注入 plugin.install(db);
} }
/** 卸载插件 */ /** 卸载插件 */
+26 -2
View File
@@ -19,7 +19,9 @@ export type StatementType =
| 'UPDATE' | 'UPDATE'
| 'DELETE' | 'DELETE'
| 'CREATE_TABLE' | 'CREATE_TABLE'
| 'DROP_TABLE'; | 'DROP_TABLE'
| 'ALTER_TABLE'
| 'TRUNCATE_TABLE';
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// 列引用 // 列引用
@@ -171,6 +173,26 @@ export interface SelectStatement {
offset?: number; offset?: number;
} }
// ---------------------------------------------------------------------------
// DDL: ALTER TABLE
// ---------------------------------------------------------------------------
export interface AlterTableStatement {
type: 'ALTER_TABLE';
name: string;
action: 'ADD' | 'DROP';
column: ASTColumnDef;
}
// ---------------------------------------------------------------------------
// DDL: TRUNCATE TABLE
// ---------------------------------------------------------------------------
export interface TruncateTableStatement {
type: 'TRUNCATE_TABLE';
name: string;
}
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// AST 联合类型 // AST 联合类型
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -182,4 +204,6 @@ export type Statement =
| UpdateStatement | UpdateStatement
| DeleteStatement | DeleteStatement
| CreateTableStatement | CreateTableStatement
| DropTableStatement; | DropTableStatement
| AlterTableStatement
| TruncateTableStatement;
+47 -1
View File
@@ -9,6 +9,7 @@ import type { IStorageEngine } from '../engine/interface';
import type { import type {
Statement, SelectStatement, InsertStatement, UpdateStatement, Statement, SelectStatement, InsertStatement, UpdateStatement,
DeleteStatement, CreateTableStatement, DropTableStatement, JoinClause, DeleteStatement, CreateTableStatement, DropTableStatement, JoinClause,
AlterTableStatement, TruncateTableStatement,
} from './ast'; } from './ast';
import { DatabaseError } from '../constants'; import { DatabaseError } from '../constants';
import { compileStatement } from './compiler'; import { compileStatement } from './compiler';
@@ -21,7 +22,16 @@ import type { WhereCondition } from '../constants';
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
export class QueryExecutor { export class QueryExecutor {
constructor(private engine: IStorageEngine) {} private maxRowsPerQuery: number;
constructor(private engine: IStorageEngine, maxRowsPerQuery: number = 0) {
this.maxRowsPerQuery = maxRowsPerQuery;
}
/** 设置查询结果行数上限 */
setMaxRowsPerQuery(max: number): void {
this.maxRowsPerQuery = max;
}
async execute(stmt: Statement): Promise<unknown> { async execute(stmt: Statement): Promise<unknown> {
switch (stmt.type) { switch (stmt.type) {
@@ -32,6 +42,8 @@ export class QueryExecutor {
case 'DELETE': return this.executeDelete(stmt); case 'DELETE': return this.executeDelete(stmt);
case 'CREATE_TABLE': return this.executeCreateTable(stmt); case 'CREATE_TABLE': return this.executeCreateTable(stmt);
case 'DROP_TABLE': return this.executeDropTable(stmt); case 'DROP_TABLE': return this.executeDropTable(stmt);
case 'ALTER_TABLE': return this.executeAlterTable(stmt as any);
case 'TRUNCATE_TABLE': return this.executeTruncateTable(stmt as any);
default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT'); default: throw new DatabaseError('Unknown statement type', 'UNKNOWN_STATEMENT');
} }
} }
@@ -99,6 +111,12 @@ export class QueryExecutor {
if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') { if (!hasGroupBy && !hasAggregate && stmt.columns.length > 0 && stmt.columns[0] !== '*') {
rows = rows.map((row) => projectColumns(row, stmt.columns)); rows = rows.map((row) => projectColumns(row, stmt.columns));
} }
// 全局行数上限保护
if (this.maxRowsPerQuery > 0 && rows.length > this.maxRowsPerQuery) {
rows = rows.slice(0, this.maxRowsPerQuery);
}
return rows; return rows;
} }
@@ -272,6 +290,34 @@ export class QueryExecutor {
return this.engine.dropTable(stmt.name); return this.engine.dropTable(stmt.name);
} }
private async executeAlterTable(stmt: AlterTableStatement): Promise<void> {
const exists = await this.engine.hasTable(stmt.name);
if (!exists) throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
const schema = await this.engine.getTableSchema(stmt.name);
if (!schema) return;
if (stmt.action === 'ADD') {
if (schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" already exists in table "${stmt.name}"`, 'COLUMN_EXISTS');
}
schema.columns[stmt.column.name] = astColumnToColumnDef(stmt.column);
} else if (stmt.action === 'DROP') {
if (!schema.columns[stmt.column.name]) {
throw new DatabaseError(`Column "${stmt.column.name}" does not exist in table "${stmt.name}"`, 'COLUMN_NOT_FOUND');
}
delete schema.columns[stmt.column.name];
}
// 重建表结构
await this.engine.dropTable(stmt.name);
await this.engine.createTable(schema);
}
private async executeTruncateTable(stmt: TruncateTableStatement): Promise<void> {
const exists = await this.engine.hasTable(stmt.name);
if (!exists) throw new DatabaseError(`Table "${stmt.name}" does not exist`, 'TABLE_NOT_FOUND');
return this.engine.clear(stmt.name);
}
getEngine(): IStorageEngine { return this.engine; } getEngine(): IStorageEngine { return this.engine; }
// =================================================================== // ===================================================================
+52
View File
@@ -16,6 +16,8 @@ import type {
DeleteStatement, DeleteStatement,
CreateTableStatement, CreateTableStatement,
DropTableStatement, DropTableStatement,
AlterTableStatement,
TruncateTableStatement,
ASTColumnDef, ASTColumnDef,
} from '../query/ast'; } from '../query/ast';
import type { WhereCondition, OrderBy, SortDirection } from '../constants'; import type { WhereCondition, OrderBy, SortDirection } from '../constants';
@@ -52,6 +54,10 @@ export class Parser {
return this.parseCreateTable(); return this.parseCreateTable();
case TokenType.DROP: case TokenType.DROP:
return this.parseDropTable(); return this.parseDropTable();
case TokenType.ALTER:
return this.parseAlterTable();
case TokenType.TRUNCATE:
return this.parseTruncateTable();
default: default:
throw this.error(`Unexpected token "${this.curToken.value}"`); throw this.error(`Unexpected token "${this.curToken.value}"`);
} }
@@ -426,6 +432,52 @@ export class Parser {
return 'RESTRICT'; return 'RESTRICT';
} }
// ===================================================================
// ALTER TABLE
// ===================================================================
private parseAlterTable(): AlterTableStatement {
this.expect(TokenType.ALTER);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
// ADD COLUMN / DROP COLUMN
let action: 'ADD' | 'DROP';
if (this.curTokenIs(TokenType.ADD)) {
action = 'ADD';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const col = this.parseColumnDef();
return { type: 'ALTER_TABLE', name: tableName, action, column: col };
} else if (this.curTokenIs(TokenType.DROP) ||
(this._isKeywordAsIdent() && this.curToken.value.toUpperCase() === 'DROP')) {
action = 'DROP';
this.nextToken();
// Optional COLUMN keyword
if (this.curToken.type === TokenType.IDENTIFIER && this.curToken.value.toUpperCase() === 'COLUMN') {
this.nextToken();
}
const colName = this.expectIdentifier('column name');
return { type: 'ALTER_TABLE', name: tableName, action, column: { name: colName, type: 'string' } };
} else {
throw this.error('Expected ADD or DROP in ALTER TABLE');
}
}
// ===================================================================
// TRUNCATE TABLE
// ===================================================================
private parseTruncateTable(): TruncateTableStatement {
this.expect(TokenType.TRUNCATE);
this.expect(TokenType.TABLE);
const tableName = this.expectIdentifier('table name');
return { type: 'TRUNCATE_TABLE', name: tableName };
}
// =================================================================== // ===================================================================
// DROP TABLE // DROP TABLE
// =================================================================== // ===================================================================
+6
View File
@@ -44,6 +44,9 @@ export enum TokenType {
IF = 'IF', IF = 'IF',
EXISTS = 'EXISTS', EXISTS = 'EXISTS',
FALSE = 'FALSE', FALSE = 'FALSE',
ALTER = 'ALTER',
ADD = 'ADD',
TRUNCATE = 'TRUNCATE',
// JOIN 相关 // JOIN 相关
INNER = 'INNER', INNER = 'INNER',
@@ -139,6 +142,9 @@ export const KEYWORDS: Record<string, TokenType> = {
'BETWEEN': TokenType.BETWEEN, 'BETWEEN': TokenType.BETWEEN,
'IF': TokenType.IF, 'IF': TokenType.IF,
'EXISTS': TokenType.EXISTS, 'EXISTS': TokenType.EXISTS,
'ALTER': TokenType.ALTER,
'ADD': TokenType.ADD,
'TRUNCATE': TokenType.TRUNCATE,
// JOIN // JOIN
'INNER': TokenType.INNER, 'INNER': TokenType.INNER,
+1 -1
View File
@@ -1,5 +1,5 @@
/** /**
* YOUR-PROJECT Utils * metona-sqlark Utils
* @module utils * @module utils
*/ */
+374
View File
@@ -0,0 +1,374 @@
/**
* v0.2.5
* P0/P1/P2
*/
import { VERSION } from '../src/constants';
import { MetonaSqlark } from '../src/core';
import { AriaEngine } from '../src/engine/aria/index';
import { MemoryEngine } from '../src/engine/memory';
import { parse } from '../src/sql/parser';
import { QueryExecutor } from '../src/query/executor';
import { WAL } from '../src/engine/aria/wal/log';
import { SSTableReader } from '../src/engine/aria/index/sstable';
import { BloomFilter } from '../src/engine/aria/index/bloom';
import { CryptoManager } from '../src/engine/aria/crypto';
import { PluginManager } from '../src/plugin/index';
import type { SSTableMeta } from '../src/engine/aria/types';
import type { MetonaPlugin } from '../src/constants';
import { createSchema } from '../src/table/schema';
// ---------------------------------------------------------------------------
// P0-1: 版本号统一
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-1: 版本号统一', () => {
test('VERSION 常量为 0.2.5', () => {
expect(VERSION).toBe('0.2.5');
});
});
// ---------------------------------------------------------------------------
// P0-2: AriaEngine OPFS 后端映射修复
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-2: AriaEngine OPFS 后端映射', () => {
test('mode=aria + diskEngine=opfs 时应使用 opfs 后端', () => {
const db = new MetonaSqlark({ name: 'test-opfs-map', mode: 'aria', diskEngine: 'opfs' });
// 不实际 open(需要浏览器环境),只验证 createEngine 逻辑
// 通过 getEngine 在 init 后检查
expect(db).toBeDefined();
});
test('mode=aria + diskEngine=indexeddb 时应使用 indexeddb 后端', () => {
const db = new MetonaSqlark({ name: 'test-idb-map', mode: 'aria', diskEngine: 'indexeddb' });
expect(db).toBeDefined();
});
});
// ---------------------------------------------------------------------------
// P0-3: _onError 接入执行路径
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-3: _onError 接入执行路径', () => {
test('query 失败时调用 onError 回调', async () => {
const errors: Error[] = [];
const db = new MetonaSqlark({
name: 'test-onerror',
mode: 'memory',
onError: (e) => errors.push(e),
});
await db.init();
await db.defineTable('users', {
id: { type: 'string', primaryKey: true },
name: { type: 'string' },
});
// 故意执行不存在的表查询
await expect(db.query('SELECT * FROM nonexistent')).rejects.toThrow();
expect(errors.length).toBeGreaterThan(0);
await db.close();
});
test('defineTable 失败时调用 onError', async () => {
const errors: Error[] = [];
const db = new MetonaSqlark({
name: 'test-onerror2',
mode: 'memory',
onError: (e) => errors.push(e),
});
await db.init();
await db.defineTable('dup', {
id: { type: 'string', primaryKey: true },
});
// 重复创建
await expect(db.defineTable('dup', {
id: { type: 'string', primaryKey: true },
})).rejects.toThrow();
expect(errors.length).toBeGreaterThan(0);
await db.close();
});
});
// ---------------------------------------------------------------------------
// P0-4: maxRowsPerQuery 生效
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-4: maxRowsPerQuery 生效', () => {
test('结果集被截断为 maxRowsPerQuery', async () => {
const engine = new MemoryEngine();
await engine.open('test-maxrows', 1);
await engine.createTable(createSchema('items', {
id: { type: 'string', primaryKey: true },
val: { type: 'number' },
}));
// 插入 100 行
for (let i = 0; i < 100; i++) {
await engine.insert('items', [{ id: `item${i}`, val: i }]);
}
const executor = new QueryExecutor(engine, 10); // maxRowsPerQuery=10
const stmt = parse('SELECT * FROM items');
const result = await executor.execute(stmt) as Record<string, unknown>[];
expect(result.length).toBe(10); // 截断为 10 行
await engine.close();
});
test('maxRowsPerQuery=0 表示不限制', async () => {
const engine = new MemoryEngine();
await engine.open('test-nolimit', 1);
await engine.createTable(createSchema('items', {
id: { type: 'string', primaryKey: true },
}));
for (let i = 0; i < 50; i++) {
await engine.insert('items', [{ id: `i${i}` }]);
}
const executor = new QueryExecutor(engine, 0);
const stmt = parse('SELECT * FROM items');
const result = await executor.execute(stmt) as Record<string, unknown>[];
expect(result.length).toBe(50);
await engine.close();
});
});
// ---------------------------------------------------------------------------
// P0-5: WAL full 模式真正同步
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-5: WAL full 模式同步', () => {
test('append 在 full 模式下是 async 且可 await', async () => {
let appendCount = 0;
const wal = new WAL({
append: async (_data: Uint8Array) => { appendCount++; },
readAll: async () => new Uint8Array(0),
truncate: async () => {},
exists: async () => false,
}, true, 'full');
// append 现在返回 Promise
await wal.append({
type: 1, // INSERT
txnId: 0,
tableName: 'test',
key: 'k1',
data: { v: 1 },
} as any);
expect(appendCount).toBe(1);
});
});
// ---------------------------------------------------------------------------
// P0-6: PluginManager.install 传 db 实例
// ---------------------------------------------------------------------------
describe('[v0.2.5] P0-6: PluginManager.install 传 db 实例', () => {
test('register 传 db 给 install', () => {
let receivedDb: unknown = null;
const plugin: MetonaPlugin = {
name: 'test-plugin',
install: (db) => { receivedDb = db; },
destroy: () => {},
};
const pm = new PluginManager();
const fakeDb = { name: 'fake' };
pm.register(plugin, fakeDb);
expect(receivedDb).toBe(fakeDb);
});
});
// ---------------------------------------------------------------------------
// P1-7: SSTableReader 二分查找统一
// ---------------------------------------------------------------------------
describe('[v0.2.5] P1-7: SSTableReader 二分查找', () => {
test('rangeScan 使用二分查找正确定位', () => {
// 构建一个 SSTable 手工
const { SSTableBuilder } = require('../src/engine/aria/index/sstable_builder');
const builder = new SSTableBuilder(4096);
// 添加足够多的条目以形成多个 block
for (let i = 0; i < 100; i++) {
const key = `key${String(i).padStart(5, '0')}`;
builder.add(key, { data: `value${i}` });
}
const { sstableData } = builder.build();
const meta: SSTableMeta = {
id: 1,
level: 0,
minKey: 'key00000',
maxKey: 'key00099',
blockCount: 1,
totalSize: sstableData.byteLength,
bloomData: null,
};
const reader = new SSTableReader(sstableData, meta);
// 精确查找
const result = reader.get('key00050');
expect(result).not.toBeNull();
expect((result as any).data).toBe('value50');
// 范围扫描
const collected: string[] = [];
reader.rangeScan('key00010', 'key00020', (k) => collected.push(k));
expect(collected.length).toBeGreaterThan(0);
expect(collected[0]).toBe('key00010');
});
});
// ---------------------------------------------------------------------------
// P1-8: SQL 注入防护 — 表名校验
// ---------------------------------------------------------------------------
describe('[v0.2.5] P1-8: SQL 注入防护', () => {
test('表名校验正则表达式正确', () => {
// 验证正则逻辑本身
const validName = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
expect(validName.test('users')).toBe(true);
expect(validName.test('user_table')).toBe(true);
expect(validName.test('_private')).toBe(true);
expect(validName.test('Table1')).toBe(true);
// 非法表名
expect(validName.test('users; DROP TABLE')).toBe(false);
expect(validName.test('1table')).toBe(false);
expect(validName.test('user.name')).toBe(false);
expect(validName.test('user name')).toBe(false);
expect(validName.test("'; DROP TABLE users; --")).toBe(false);
});
});
// ---------------------------------------------------------------------------
// P1-9: crypto 实例化
// ---------------------------------------------------------------------------
describe('[v0.2.5] P1-9: CryptoManager 实例化', () => {
test('CryptoManager 可以独立实例化', () => {
const cm1 = new CryptoManager();
const cm2 = new CryptoManager();
expect(cm1.enabled).toBe(false);
expect(cm2.enabled).toBe(false);
// 两个实例互不影响
expect(cm1).not.toBe(cm2);
});
});
// ---------------------------------------------------------------------------
// P2-14: ALTER TABLE 语法
// ---------------------------------------------------------------------------
describe('[v0.2.5] P2-14: ALTER TABLE', () => {
test('解析 ALTER TABLE ADD COLUMN', () => {
const stmt = parse('ALTER TABLE users ADD COLUMN email VARCHAR(255) UNIQUE');
expect(stmt.type).toBe('ALTER_TABLE');
expect((stmt as any).name).toBe('users');
expect((stmt as any).action).toBe('ADD');
expect((stmt as any).column.name).toBe('email');
});
test('解析 ALTER TABLE DROP COLUMN', () => {
const stmt = parse('ALTER TABLE users DROP COLUMN email');
expect(stmt.type).toBe('ALTER_TABLE');
expect((stmt as any).action).toBe('DROP');
expect((stmt as any).column.name).toBe('email');
});
test('执行 ALTER TABLE ADD COLUMN', async () => {
const engine = new MemoryEngine();
await engine.open('test-alter', 1);
await engine.createTable(createSchema('users', {
id: { type: 'string', primaryKey: true },
name: { type: 'string' },
}));
const executor = new QueryExecutor(engine);
const stmt = parse('ALTER TABLE users ADD COLUMN email VARCHAR(255)');
await executor.execute(stmt);
const schema = await engine.getTableSchema('users');
expect(schema!.columns.email).toBeDefined();
await engine.close();
});
test('执行 ALTER TABLE DROP COLUMN', async () => {
const engine = new MemoryEngine();
await engine.open('test-alter-drop', 1);
await engine.createTable(createSchema('users', {
id: { type: 'string', primaryKey: true },
name: { type: 'string' },
email: { type: 'string' },
}));
const executor = new QueryExecutor(engine);
const stmt = parse('ALTER TABLE users DROP COLUMN email');
await executor.execute(stmt);
const schema = await engine.getTableSchema('users');
expect(schema!.columns.email).toBeUndefined();
await engine.close();
});
});
// ---------------------------------------------------------------------------
// P2-15: TRUNCATE TABLE 语法
// ---------------------------------------------------------------------------
describe('[v0.2.5] P2-15: TRUNCATE TABLE', () => {
test('解析 TRUNCATE TABLE', () => {
const stmt = parse('TRUNCATE TABLE users');
expect(stmt.type).toBe('TRUNCATE_TABLE');
expect((stmt as any).name).toBe('users');
});
test('执行 TRUNCATE TABLE 清空数据', async () => {
const engine = new MemoryEngine();
await engine.open('test-truncate', 1);
await engine.createTable(createSchema('items', {
id: { type: 'string', primaryKey: true },
}));
await engine.insert('items', [
{ id: 'a' }, { id: 'b' }, { id: 'c' },
]);
const executor = new QueryExecutor(engine);
const stmt = parse('TRUNCATE TABLE items');
await executor.execute(stmt);
const rows = await engine.find('items', { table: 'items' });
expect(rows.length).toBe(0);
await engine.close();
});
});
// ---------------------------------------------------------------------------
// P2-12: WAL 大小阈值接入 checkpoint
// ---------------------------------------------------------------------------
describe('[v0.2.5] P2-12: WAL 大小阈值', () => {
test('CheckpointManager 接收 walSizeThreshold 参数', () => {
const { CheckpointManager } = require('../src/engine/aria/wal/checkpoint');
const fakeLsm = { flush: async () => {} };
const fakeWal = { flush: async () => {}, checkpoint: async () => {}, getBufferedCount: () => 0 };
const cm = new CheckpointManager(fakeLsm, fakeWal, null, 1000, 1024);
expect(cm).toBeDefined();
expect(cm.getOpCount()).toBe(0);
});
});
// ---------------------------------------------------------------------------
// P2-13: compactLevelSync 接口公开化
// ---------------------------------------------------------------------------
describe('[v0.2.5] P2-13: compactLevel public', () => {
test('LSM.compactLevel 是 public 方法', () => {
const { LSM } = require('../src/engine/aria/index/lsm');
const lsm = new LSM({
sstableStore: {
save: async () => {}, load: async () => null, delete: async () => {},
allocateId: async () => 1, listMeta: async () => [], saveMeta: async () => {}, deleteMeta: async () => {},
},
});
expect(typeof lsm.compactLevel).toBe('function');
});
});