dataply 0.0.16-alpha.4 → 0.0.16-alpha.6

package/dist/cjs/index.js

@@ -5619,8 +5619,6 @@ var VirtualFileSystem = class {
   }
   /** Cache list (Page ID -> Data Buffer) */
   cache;
-  /** Page IDs that have changes and need disk synchronization */
-  dirtyPages = /* @__PURE__ */ new Set();
   /** Track logical file size */
   fileSize;
   /** Bit shift value for page size */
@@ -5645,11 +5643,9 @@ var VirtualFileSystem = class {
     if (restoredPages.size === 0) {
       return;
     }
+    const promises = [];
     for (const [pageId, data] of restoredPages) {
-      if (pageId > 1e6) {
-        console.warn(`[VFS] Ignoring suspicious PageID ${pageId} during recovery.`);
-        continue;
-      }
+      if (pageId > 1e6) continue;
       try {
         const manager = new PageManagerFactory().getManager(data);
         if (!manager.verifyChecksum(data)) {
@@ -5661,12 +5657,23 @@ var VirtualFileSystem = class {
         continue;
       }
       this.cache.set(pageId, data);
-      this.dirtyPages.add(pageId);
+      promises.push(this._writeAsync(
+        this.fileHandle,
+        data,
+        0,
+        this.pageSize,
+        pageId * this.pageSize
+      ));
       const endPos = (pageId + 1) * this.pageSize;
       if (endPos > this.fileSize) {
         this.fileSize = endPos;
       }
     }
+    Promise.all(promises).then(() => {
+      if (this.logManager && restoredPages.size > 0) {
+        this.logManager.clear().catch(console.error);
+      }
+    });
   }
   /**
    * Prepares the transaction for commit (Phase 1).
@@ -5674,17 +5681,10 @@ var VirtualFileSystem = class {
    * @param tx Transaction
    */
   async prepareCommit(tx) {
-    const dirtyPages = tx.__getDirtyPages();
-    if (dirtyPages.size === 0) {
+    const dirtyPageMap = tx.__getDirtyPages();
+    if (dirtyPageMap.size === 0) {
       return;
     }
-    const dirtyPageMap = /* @__PURE__ */ new Map();
-    for (const pageId of dirtyPages) {
-      const page = this.cache.get(pageId);
-      if (page) {
-        dirtyPageMap.set(pageId, page);
-      }
-    }
     if (this.logManager && dirtyPageMap.size > 0) {
       await this.logManager.append(dirtyPageMap);
     }
@@ -5695,18 +5695,18 @@ var VirtualFileSystem = class {
    * @param tx Transaction
    */
   async finalizeCommit(tx) {
-    const dirtyPages = tx.__getDirtyPages();
-    if (dirtyPages.size === 0) {
+    const dirtyPageMap = tx.__getDirtyPages();
+    if (dirtyPageMap.size === 0) {
       this.cleanupTransaction(tx);
       return;
     }
     if (this.logManager) {
       await this.logManager.writeCommitMarker();
     }
-    const sortedPages = Array.from(dirtyPages).sort((a, b) => a - b);
+    const sortedPageIds = Array.from(dirtyPageMap.keys()).sort((a, b) => a - b);
     const promises = [];
-    for (const pageId of sortedPages) {
-      const page = this.cache.get(pageId);
+    for (const pageId of sortedPageIds) {
+      const page = dirtyPageMap.get(pageId);
       if (page) {
         promises.push(this._writeAsync(
           this.fileHandle,
@@ -5714,7 +5714,10 @@ var VirtualFileSystem = class {
           0,
           this.pageSize,
           pageId * this.pageSize
-        ));
+        ).then((v) => {
+          this.cache.set(pageId, page);
+          return v;
+        }));
       }
     }
     await Promise.all(promises);
@@ -5739,18 +5742,14 @@ var VirtualFileSystem = class {
    * @param tx Transaction
    */
   async rollback(tx) {
-    const dirtyPages = tx.__getDirtyPages();
-    for (const pageId of dirtyPages) {
-      const undoData = tx.__getUndoPage(pageId);
-      if (undoData) {
-        this.cache.set(pageId, undoData);
-      }
+    for (const [pageId, undoData] of tx.__getUndoPages()) {
+      this.cache.set(pageId, undoData);
     }
     this.cleanupTransaction(tx);
   }
   cleanupTransaction(tx) {
-    const pages = tx.__getDirtyPages();
-    for (const pageId of pages) {
+    const pageIds = tx.__getDirtyPageIds();
+    for (const pageId of pageIds) {
       this.dirtyPageOwners.delete(pageId);
     }
     this.activeTransactions.delete(tx.id);
@@ -5807,6 +5806,10 @@ var VirtualFileSystem = class {
     });
   }
   async _readPage(pageIndex, tx) {
+    const txDirtyPage = tx.__getDirtyPage(pageIndex);
+    if (txDirtyPage) {
+      return txDirtyPage;
+    }
     if (this.activeTransactions.size > 0) {
       const ownerTx = this.dirtyPageOwners.get(pageIndex);
       if (ownerTx) {
@@ -5899,7 +5902,7 @@ var VirtualFileSystem = class {
       page.set(buffer.subarray(bufferOffset, bufferOffset + (writeEnd - writeStart)), writeStart);
       bufferOffset += writeEnd - writeStart;
       this.cache.set(pageIndex, page);
-      tx.__addDirtyPage(pageIndex);
+      tx.__addDirtyPage(pageIndex, page);
     }
     const endPosition = offset + buffer.length;
     if (endPosition > this.fileSize) {
@@ -5907,33 +5910,10 @@ var VirtualFileSystem = class {
     }
     return buffer.length;
   }
-  /**
-   * Synchronizes dirty pages to disk.
-   */
-  async sync() {
-    const promises = [];
-    const sortedPages = Array.from(this.dirtyPages).sort((a, b) => a - b);
-    for (const pageIndex of sortedPages) {
-      const page = this.cache.get(pageIndex);
-      if (page) {
-        promises.push(this._writeAsync(
-          this.fileHandle,
-          page,
-          0,
-          this.pageSize,
-          pageIndex * this.pageSize
-        ));
-      }
-    }
-    await Promise.all(promises);
-    this.dirtyPages.clear();
-  }
   /**
    * Closes the file.
    */
   async close() {
-    await this.sync();
-    this.dirtyPages.clear();
     this.cache.clear();
     if (this.logManager) {
       this.logManager.close();
@@ -6937,8 +6917,8 @@ var Transaction = class {
   pageLocks = /* @__PURE__ */ new Map();
   /** Undo Logs: PageID -> Original Page Buffer (Snapshot) */
   undoPages = /* @__PURE__ */ new Map();
-  /** Dirty Pages modified by the transaction */
-  dirtyPages = /* @__PURE__ */ new Set();
+  /** Dirty Pages modified by the transaction: PageID -> Modified Page Buffer */
+  dirtyPages = /* @__PURE__ */ new Map();
   /** BPTree Transaction instance */
   bptreeTx;
   /** Whether the BPTree transaction is dirty */
@@ -7007,6 +6987,14 @@ var Transaction = class {
   __hasUndoPage(pageId) {
     return this.undoPages.has(pageId);
   }
+  /**
+   * Returns all Undo pages.
+   * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
+   * @returns Map of PageID -> Undo Page Buffer
+   */
+  __getUndoPages() {
+    return this.undoPages;
+  }
   /**
    * Acquires a write lock.
    * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
@@ -7054,15 +7042,31 @@ var Transaction = class {
     this.releaseAllLocks();
   }
   /**
-   * Adds a Dirty Page.
+   * Adds or updates a Dirty Page with its buffer.
    * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
    * @param pageId Page ID
+   * @param buffer Modified page buffer
+   */
+  __addDirtyPage(pageId, buffer) {
+    this.dirtyPages.set(pageId, buffer);
+  }
+  /**
+   * Returns a Dirty Page buffer if it exists in the current transaction.
+   * @param pageId Page ID
+   * @returns Modified page buffer or undefined
+   */
+  __getDirtyPage(pageId) {
+    return this.dirtyPages.get(pageId);
+  }
+  /**
+   * Returns the list of Dirty Page IDs.
+   * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
    */
-  __addDirtyPage(pageId) {
-    this.dirtyPages.add(pageId);
+  __getDirtyPageIds() {
+    return this.dirtyPages.keys();
   }
   /**
-   * Returns the list of Dirty Pages.
+   * Returns the map of Dirty Pages.
    * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
    */
   __getDirtyPages() {

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

@@ -10,8 +10,6 @@ export declare class VirtualFileSystem {
     protected pageCacheCapacity: number;
     /** Cache list (Page ID -> Data Buffer) */
     protected cache: LRUMap<number, Uint8Array>;
-    /** Page IDs that have changes and need disk synchronization */
-    protected dirtyPages: Set<number>;
     /** Track logical file size */
     protected fileSize: number;
     /** Bit shift value for page size */
@@ -98,10 +96,6 @@ export declare class VirtualFileSystem {
      * @returns Length of data written
      */
     write(offset: number, buffer: Uint8Array, tx: Transaction): Promise<number>;
-    /**
-     * Synchronizes dirty pages to disk.
-     */
-    sync(): Promise<void>;
     /**
      * Closes the file.
      */

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

@@ -18,7 +18,7 @@ export declare class Transaction {
     private pageLocks;
     /** Undo Logs: PageID -> Original Page Buffer (Snapshot) */
     private undoPages;
-    /** Dirty Pages modified by the transaction */
+    /** Dirty Pages modified by the transaction: PageID -> Modified Page Buffer */
     private dirtyPages;
     /** BPTree Transaction instance */
     private bptreeTx?;
@@ -78,6 +78,12 @@ export declare class Transaction {
      * @returns True if the transaction has an Undo page for the given page ID
      */
     __hasUndoPage(pageId: number): boolean;
+    /**
+     * Returns all Undo pages.
+     * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
+     * @returns Map of PageID -> Undo Page Buffer
+     */
+    __getUndoPages(): Map<number, Uint8Array>;
     /**
      * Acquires a write lock.
      * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
@@ -98,16 +104,28 @@ export declare class Transaction {
      */
     rollback(cleanup?: boolean): Promise<void>;
     /**
-     * Adds a Dirty Page.
+     * Adds or updates a Dirty Page with its buffer.
      * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
      * @param pageId Page ID
+     * @param buffer Modified page buffer
+     */
+    __addDirtyPage(pageId: number, buffer: Uint8Array): void;
+    /**
+     * Returns a Dirty Page buffer if it exists in the current transaction.
+     * @param pageId Page ID
+     * @returns Modified page buffer or undefined
+     */
+    __getDirtyPage(pageId: number): Uint8Array | undefined;
+    /**
+     * Returns the list of Dirty Page IDs.
+     * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
      */
-    __addDirtyPage(pageId: number): void;
+    __getDirtyPageIds(): IterableIterator<number>;
     /**
-     * Returns the list of Dirty Pages.
+     * Returns the map of Dirty Pages.
      * Does not call this method directly. It is called by the `VirtualFileSystem` instance.
      */
-    __getDirtyPages(): Set<number>;
+    __getDirtyPages(): Map<number, Uint8Array>;
     /**
      * Releases all locks.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.16-alpha.4",
+  "version": "0.0.16-alpha.6",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",