dataply 0.0.19 → 0.0.20-alpha.1

package/dist/cjs/index.js

@@ -254,6 +254,45 @@ var MVCCTransaction = class {
     }
     return { success: true, created, updated, deleted };
   }
+  /**
+   * Cleans up both deletedCache and versionIndex based on minActiveVersion.
+   * Root transactions call this after commit to reclaim memory.
+   */
+  _cleanupDeletedCache() {
+    if (this.deletedCache.size === 0 && this.versionIndex.size === 0) return;
+    let minActiveVersion = this.version;
+    if (this.activeTransactions.size > 0) {
+      for (const tx of this.activeTransactions) {
+        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
+          minActiveVersion = tx.snapshotVersion;
+        }
+      }
+    }
+    if (this.deletedCache.size > 0) {
+      for (const [key, cachedList] of this.deletedCache) {
+        const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
+        if (remaining.length === 0) {
+          this.deletedCache.delete(key);
+        } else {
+          this.deletedCache.set(key, remaining);
+        }
+      }
+    }
+    if (this.versionIndex.size > 0) {
+      for (const [key, versions] of this.versionIndex) {
+        let latestInSnapshotIdx = -1;
+        for (let i = versions.length - 1; i >= 0; i--) {
+          if (versions[i].version <= minActiveVersion) {
+            latestInSnapshotIdx = i;
+            break;
+          }
+        }
+        if (latestInSnapshotIdx > 0) {
+          versions.splice(0, latestInSnapshotIdx);
+        }
+      }
+    }
+  }
 };
 var SyncMVCCStrategy = class extends MVCCStrategy {
 };
@@ -593,25 +632,6 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
     if (!this.versionIndex.has(key)) this.versionIndex.set(key, []);
     this.versionIndex.get(key).push({ version: snapshotVersion, exists: false });
   }
-  _cleanupDeletedCache() {
-    if (this.deletedCache.size === 0) return;
-    let minActiveVersion = this.version;
-    if (this.activeTransactions.size > 0) {
-      for (const tx of this.activeTransactions) {
-        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
-          minActiveVersion = tx.snapshotVersion;
-        }
-      }
-    }
-    for (const [key, cachedList] of this.deletedCache) {
-      const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
-      if (remaining.length === 0) {
-        this.deletedCache.delete(key);
-      } else {
-        this.deletedCache.set(key, remaining);
-      }
-    }
-  }
 };
 var AsyncMVCCStrategy = class extends MVCCStrategy {
 };
@@ -1220,25 +1240,6 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
     if (!this.versionIndex.has(key)) this.versionIndex.set(key, []);
     this.versionIndex.get(key).push({ version: snapshotVersion, exists: false });
   }
-  _cleanupDeletedCache() {
-    if (this.deletedCache.size === 0) return;
-    let minActiveVersion = this.version;
-    if (this.activeTransactions.size > 0) {
-      for (const tx of this.activeTransactions) {
-        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
-          minActiveVersion = tx.snapshotVersion;
-        }
-      }
-    }
-    for (const [key, cachedList] of this.deletedCache) {
-      const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
-      if (remaining.length === 0) {
-        this.deletedCache.delete(key);
-      } else {
-        this.deletedCache.set(key, remaining);
-      }
-    }
-  }
 };
 var LRUMap = class {
   capacity;
@@ -4704,6 +4705,45 @@ var MVCCTransaction2 = class {
     }
     return { success: true, created, updated, deleted };
   }
+  /**
+   * Cleans up both deletedCache and versionIndex based on minActiveVersion.
+   * Root transactions call this after commit to reclaim memory.
+   */
+  _cleanupDeletedCache() {
+    if (this.deletedCache.size === 0 && this.versionIndex.size === 0) return;
+    let minActiveVersion = this.version;
+    if (this.activeTransactions.size > 0) {
+      for (const tx of this.activeTransactions) {
+        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
+          minActiveVersion = tx.snapshotVersion;
+        }
+      }
+    }
+    if (this.deletedCache.size > 0) {
+      for (const [key, cachedList] of this.deletedCache) {
+        const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
+        if (remaining.length === 0) {
+          this.deletedCache.delete(key);
+        } else {
+          this.deletedCache.set(key, remaining);
+        }
+      }
+    }
+    if (this.versionIndex.size > 0) {
+      for (const [key, versions] of this.versionIndex) {
+        let latestInSnapshotIdx = -1;
+        for (let i = versions.length - 1; i >= 0; i--) {
+          if (versions[i].version <= minActiveVersion) {
+            latestInSnapshotIdx = i;
+            break;
+          }
+        }
+        if (latestInSnapshotIdx > 0) {
+          versions.splice(0, latestInSnapshotIdx);
+        }
+      }
+    }
+  }
 };
 var SyncMVCCStrategy2 = class extends MVCCStrategy2 {
 };
@@ -5043,25 +5083,6 @@ var SyncMVCCTransaction2 = class _SyncMVCCTransaction2 extends MVCCTransaction2
     if (!this.versionIndex.has(key)) this.versionIndex.set(key, []);
     this.versionIndex.get(key).push({ version: snapshotVersion, exists: false });
   }
-  _cleanupDeletedCache() {
-    if (this.deletedCache.size === 0) return;
-    let minActiveVersion = this.version;
-    if (this.activeTransactions.size > 0) {
-      for (const tx of this.activeTransactions) {
-        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
-          minActiveVersion = tx.snapshotVersion;
-        }
-      }
-    }
-    for (const [key, cachedList] of this.deletedCache) {
-      const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
-      if (remaining.length === 0) {
-        this.deletedCache.delete(key);
-      } else {
-        this.deletedCache.set(key, remaining);
-      }
-    }
-  }
 };
 var AsyncMVCCStrategy2 = class extends MVCCStrategy2 {
 };
@@ -5670,25 +5691,6 @@ var AsyncMVCCTransaction2 = class _AsyncMVCCTransaction2 extends MVCCTransaction
     if (!this.versionIndex.has(key)) this.versionIndex.set(key, []);
     this.versionIndex.get(key).push({ version: snapshotVersion, exists: false });
   }
-  _cleanupDeletedCache() {
-    if (this.deletedCache.size === 0) return;
-    let minActiveVersion = this.version;
-    if (this.activeTransactions.size > 0) {
-      for (const tx of this.activeTransactions) {
-        if (!tx.committed && tx.snapshotVersion < minActiveVersion) {
-          minActiveVersion = tx.snapshotVersion;
-        }
-      }
-    }
-    for (const [key, cachedList] of this.deletedCache) {
-      const remaining = cachedList.filter((item) => item.deletedAtVersion > minActiveVersion);
-      if (remaining.length === 0) {
-        this.deletedCache.delete(key);
-      } else {
-        this.deletedCache.set(key, remaining);
-      }
-    }
-  }
 };
 
 // src/utils/numberToBytes.ts
@@ -7373,6 +7375,7 @@ var WALManager = class {
   entrySize;
   buffer;
   view;
+  commitCount = 0;
   /**
    * Constructor
    * @param walFilePath WAL file path
@@ -7532,6 +7535,20 @@ var WALManager = class {
     }
     return restoredPages;
   }
+  /**
+   * Increments the commit count.
+   */
+  incrementCommitCount() {
+    this.commitCount++;
+  }
+  /**
+   * Returns whether a checkpoint should be performed.
+   * @param threshold Threshold
+   * @returns Whether a checkpoint should be performed
+   */
+  shouldCheckpoint(threshold) {
+    return this.commitCount >= threshold;
+  }
   /**
    * Initializes (clears) the log file.
    * Should be called after a checkpoint.
@@ -7544,6 +7561,7 @@ var WALManager = class {
     return new Promise((resolve, reject) => {
       import_node_fs.default.truncate(this.walFilePath, 0, (err) => {
         if (err) return reject(err);
+        this.commitCount = 0;
         resolve();
       });
     });
@@ -7669,16 +7687,15 @@ var PageMVCCStrategy = class extends AsyncMVCCStrategy2 {
 // src/core/PageFileSystem.ts
 var PageFileSystem = class {
   /**
-   * @param fileHandle 파일 핸들 (fs.open으로 얻은 핸들)
-   * @param pageSize 페이지 크기
    * @param pageCacheCapacity 페이지 캐시 크기
-   * @param walPath WAL 파일 경로 (기본값: null)
+   * @param options 데이터플라이 옵션
    */
-  constructor(fileHandle, pageSize, pageCacheCapacity, walPath) {
+  constructor(fileHandle, pageSize, pageCacheCapacity, options) {
     this.fileHandle = fileHandle;
     this.pageSize = pageSize;
     this.pageCacheCapacity = pageCacheCapacity;
-    this.walPath = walPath;
+    this.options = options;
+    const walPath = options.wal;
     this.walManager = walPath ? new WALManager(walPath, pageSize) : null;
     this.pageManagerFactory = new PageManagerFactory();
     this.pageStrategy = new PageMVCCStrategy(fileHandle, pageSize, pageCacheCapacity);
@@ -8003,6 +8020,7 @@ var PageFileSystem = class {
    */
   async close() {
     if (this.walManager) {
+      await this.walManager.clear();
       this.walManager.close();
     }
   }
@@ -8714,12 +8732,15 @@ var LockManager = class {
 var Transaction = class {
   /**
    * @param id Transaction ID
+   * @param context Transaction context
    * @param pageStrategy Page MVCC Strategy for disk I/O
    * @param lockManager LockManager instance
+   * @param pfs Page File System
    */
-  constructor(id, context, pageStrategy, lockManager) {
+  constructor(id, context, pageStrategy, lockManager, pfs) {
     this.context = context;
     this.lockManager = lockManager;
+    this.pfs = pfs;
     this.id = id;
     this.pageStrategy = pageStrategy;
   }
@@ -8825,9 +8846,19 @@ var Transaction = class {
         await hook();
       }
     });
+    if (this.pfs.wal && this.dirtyPages.size > 0) {
+      await this.pfs.wal.prepareCommit(this.dirtyPages);
+      await this.pfs.wal.writeCommitMarker();
+    }
     for (const [pageId, data] of this.dirtyPages) {
       await this.pageStrategy.write(pageId, data);
     }
+    if (this.pfs.wal) {
+      this.pfs.wal.incrementCommitCount();
+      if (this.pfs.wal.shouldCheckpoint(this.pfs.options.walCheckpointThreshold)) {
+        await this.pfs.wal.clear();
+      }
+    }
     this.dirtyPages.clear();
     this.undoPages.clear();
     this.releaseAllLocks();
@@ -8888,7 +8919,7 @@ var DataplyAPI = class {
       this.fileHandle,
       this.options.pageSize,
       this.options.pageCacheCapacity,
-      this.options.wal
+      this.options
     );
     this.textCodec = new TextCodec();
     this.txContext = new TransactionContext();
@@ -8946,7 +8977,8 @@ var DataplyAPI = class {
     return Object.assign({
       pageSize: 8192,
       pageCacheCapacity: 1e4,
-      wal: null
+      wal: null,
+      walCheckpointThreshold: 1e3
     }, options);
   }
   /**
@@ -9064,7 +9096,8 @@ var DataplyAPI = class {
       ++this.txIdCounter,
       this.txContext,
       this.pfs.getPageStrategy(),
-      this.lockManager
+      this.lockManager,
+      this.pfs
     );
   }
   /**
@@ -9120,9 +9153,10 @@ var DataplyAPI = class {
         await tx.rollback();
       }
       throw error;
-    }
-    if (!hasError && isInternalTx) {
-      await tx.commit();
+    } finally {
+      if (!hasError && isInternalTx) {
+        await tx.commit();
+      }
     }
   }
   /**

package/dist/types/core/PageFileSystem.d.ts

@@ -1,4 +1,4 @@
-import type { IndexPage, MetadataPage } from '../types';
+import type { IndexPage, MetadataPage, DataplyOptions } from '../types';
 import type { Transaction } from './transaction/Transaction';
 import { PageManagerFactory } from './Page';
 import { WALManager } from './WALManager';
@@ -11,18 +11,16 @@ export declare class PageFileSystem {
     readonly fileHandle: number;
     readonly pageSize: number;
     readonly pageCacheCapacity: number;
-    readonly walPath?: string | undefined | null;
+    readonly options: Required<DataplyOptions>;
     protected readonly pageFactory: PageManagerFactory;
     protected readonly walManager: WALManager | null;
     protected readonly pageManagerFactory: PageManagerFactory;
     protected readonly pageStrategy: PageMVCCStrategy;
     /**
-     * @param fileHandle 파일 핸들 (fs.open으로 얻은 핸들)
-     * @param pageSize 페이지 크기
      * @param pageCacheCapacity 페이지 캐시 크기
-     * @param walPath WAL 파일 경로 (기본값: null)
+     * @param options 데이터플라이 옵션
      */
-    constructor(fileHandle: number, pageSize: number, pageCacheCapacity: number, walPath?: string | undefined | null);
+    constructor(fileHandle: number, pageSize: number, pageCacheCapacity: number, options: Required<DataplyOptions>);
     /**
      * Initializes the page file system.
      * Performs WAL recovery if necessary.

package/dist/types/core/WALManager.d.ts

@@ -10,6 +10,7 @@ export declare class WALManager {
     private readonly entrySize;
     private buffer;
     private view;
+    private commitCount;
     /**
      * Constructor
      * @param walFilePath WAL file path
@@ -54,6 +55,16 @@ export declare class WALManager {
      * @returns Recovered page map
      */
     readAllSync(): Map<number, Uint8Array>;
+    /**
+     * Increments the commit count.
+     */
+    incrementCommitCount(): void;
+    /**
+     * Returns whether a checkpoint should be performed.
+     * @param threshold Threshold
+     * @returns Whether a checkpoint should be performed
+     */
+    shouldCheckpoint(threshold: number): boolean;
     /**
      * Initializes (clears) the log file.
      * Should be called after a checkpoint.

package/dist/types/core/transaction/Transaction.d.ts

@@ -1,3 +1,4 @@
+import type { PageFileSystem } from '../PageFileSystem';
 import { BPTreeAsyncTransaction } from 'serializable-bptree';
 import { LockManager } from './LockManager';
 import { TransactionContext } from './TxContext';
@@ -9,6 +10,7 @@ import { PageMVCCStrategy } from '../PageMVCCStrategy';
 export declare class Transaction {
     readonly context: TransactionContext;
     private readonly lockManager;
+    private readonly pfs;
     /** Transaction ID */
     readonly id: number;
     /** List of held lock IDs (LOCK_ID) */
@@ -29,10 +31,12 @@ export declare class Transaction {
     private readonly pageStrategy;
     /**
      * @param id Transaction ID
+     * @param context Transaction context
      * @param pageStrategy Page MVCC Strategy for disk I/O
      * @param lockManager LockManager instance
+     * @param pfs Page File System
      */
-    constructor(id: number, context: TransactionContext, pageStrategy: PageMVCCStrategy, lockManager: LockManager);
+    constructor(id: number, context: TransactionContext, pageStrategy: PageMVCCStrategy, lockManager: LockManager, pfs: PageFileSystem);
     /**
      * Sets the BPTree transaction.
      * @param tx BPTree transaction

package/dist/types/types/index.d.ts

@@ -1,6 +1,7 @@
 export interface DataplyOptions {
     /**
      * The size of a page in bytes.
+     * Default is 8192.
      */
     pageSize?: number;
     /**
@@ -9,8 +10,14 @@ export interface DataplyOptions {
     wal?: string | undefined | null;
     /**
      * The maximum number of pages to cache in memory.
+     * Default is 10000.
      */
     pageCacheCapacity?: number;
+    /**
+     * The number of commits before automatically clearing the WAL.
+     * Default is 1000.
+     */
+    walCheckpointThreshold?: number;
 }
 export interface DataplyMetadata {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.19",
+  "version": "0.0.20-alpha.1",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -47,8 +47,8 @@
   "dependencies": {
     "cache-entanglement": "^1.7.1",
     "hookall": "^2.2.0",
-    "mvcc-api": "^1.2.9",
+    "mvcc-api": "^1.2.11",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^8.1.0"
+    "serializable-bptree": "^8.1.1"
   }
 }