dataply 0.0.20-alpha.3 → 0.0.20-alpha.5

package/dist/cjs/index.js

@@ -7606,9 +7606,7 @@ var PageMVCCStrategy = class extends AsyncMVCCStrategy2 {
     }
     const cached = this.cache.get(pageId);
     if (cached) {
-      const copy = new Uint8Array(this.pageSize);
-      copy.set(cached);
-      return copy;
+      return cached;
     }
     const buffer = new Uint8Array(this.pageSize);
     const pageStartPos = pageId * this.pageSize;
@@ -7648,13 +7646,14 @@ var PageMVCCStrategy = class extends AsyncMVCCStrategy2 {
     if (this.dirtyPages.size === 0) {
       return;
     }
-    const sortedPageIds = Array.from(this.dirtyPages.keys()).sort((a, b) => a - b);
+    const snapshot = new Map(this.dirtyPages);
+    const sortedPageIds = Array.from(snapshot.keys()).sort((a, b) => a - b);
     for (const pageId of sortedPageIds) {
-      const data = this.dirtyPages.get(pageId);
+      const data = snapshot.get(pageId);
       const position = pageId * this.pageSize;
       await this._writeToDisk(data, position);
+      this.dirtyPages.delete(pageId);
     }
-    this.dirtyPages.clear();
   }
   /**
    * 메인 DB 파일의 물리적 동기화를 수행합니다 (fsync).
@@ -7736,13 +7735,30 @@ var PageFileSystem = class {
     this.walManager = walPath ? new WALManager(walPath, pageSize) : null;
     this.pageManagerFactory = new PageManagerFactory();
     this.pageStrategy = new PageMVCCStrategy(fileHandle, pageSize, pageCacheCapacity);
-    this.lock = new Ryoiki3();
   }
   pageFactory = new PageManagerFactory();
   walManager;
   pageManagerFactory;
   pageStrategy;
-  lock;
+  /** 글로벌 동기화(체크포인트/커밋)를 위한 Mutex */
+  lockPromise = Promise.resolve();
+  /**
+   * 글로벌 동기화 범위 내에서 작업을 실행합니다.
+   * @param task 수행할 비동기 작업
+   */
+  async runGlobalLock(task) {
+    const previous = this.lockPromise;
+    let resolveLock;
+    this.lockPromise = new Promise((resolve) => {
+      resolveLock = resolve;
+    });
+    await previous;
+    try {
+      return await task();
+    } finally {
+      resolveLock();
+    }
+  }
   /**
    * Initializes the page file system.
    * Performs WAL recovery if necessary.
@@ -7755,15 +7771,6 @@ var PageFileSystem = class {
       await this.checkpoint();
     }
   }
-  async lockCheckpoint(fn) {
-    let lockId;
-    return this.lock.writeLock(async (_lockId) => {
-      lockId = _lockId;
-      await fn();
-    }).finally(() => {
-      this.lock.writeUnlock(lockId);
-    });
-  }
   /**
    * Returns the page strategy for transaction use.
    */
@@ -8071,7 +8078,7 @@ var PageFileSystem = class {
    * 3. WAL 로그 파일 비우기 (Clear/Truncate)
    */
   async checkpoint() {
-    return this.lockCheckpoint(async () => {
+    await this.runGlobalLock(async () => {
       await this.pageStrategy.flush();
       await this.pageStrategy.sync();
       if (this.walManager) {
@@ -8707,6 +8714,30 @@ var RowTableEngine = class {
     }
     return this.fetchRowByRid(pk, rid, tx);
   }
+  /**
+   * Selects multiple rows by their PKs in a single B+ Tree traversal.
+   * @param pks Array of PKs to look up
+   * @param tx Transaction
+   * @returns Array of raw data of the rows in the same order as input PKs
+   */
+  async selectMany(pks, tx) {
+    if (pks.length === 0) {
+      return [];
+    }
+    const minPk = Math.min(...pks);
+    const maxPk = Math.max(...pks);
+    const pkSet = new Set(pks);
+    const resultMap = /* @__PURE__ */ new Map();
+    const btx = await this.getBPTreeTransaction(tx);
+    const stream = btx.whereStream({ gte: minPk, lte: maxPk });
+    for await (const [rid, pk] of stream) {
+      if (pkSet.has(pk)) {
+        const rowData = await this.fetchRowByRid(pk, rid, tx);
+        resultMap.set(pk, rowData);
+      }
+    }
+    return pks.map((pk) => resultMap.get(pk) ?? null);
+  }
   async fetchRowByRid(pk, rid, tx) {
     this.keyManager.setBufferFromKey(rid, this.ridBuffer);
     const pageId = this.keyManager.getPageId(this.ridBuffer);
@@ -8905,12 +8936,13 @@ var Transaction = class {
    * Commits the transaction.
    */
   async commit() {
-    return this.pfs.lockCheckpoint(async () => {
-      await this.context.run(this, async () => {
-        for (const hook of this.commitHooks) {
-          await hook();
-        }
-      });
+    await this.context.run(this, async () => {
+      for (const hook of this.commitHooks) {
+        await hook();
+      }
+    });
+    let shouldTriggerCheckpoint = false;
+    await this.pfs.runGlobalLock(async () => {
       if (this.pfs.wal && this.dirtyPages.size > 0) {
         await this.pfs.wal.prepareCommit(this.dirtyPages);
         await this.pfs.wal.writeCommitMarker();
@@ -8921,13 +8953,16 @@ var Transaction = class {
       if (this.pfs.wal) {
         this.pfs.wal.incrementWrittenPages(this.dirtyPages.size);
         if (this.pfs.wal.shouldCheckpoint(this.pfs.options.walCheckpointThreshold)) {
-          await this.pfs.checkpoint();
+          shouldTriggerCheckpoint = true;
         }
       }
-      this.dirtyPages.clear();
-      this.undoPages.clear();
-      this.releaseAllLocks();
     });
+    if (shouldTriggerCheckpoint) {
+      await this.pfs.checkpoint();
+    }
+    this.dirtyPages.clear();
+    this.undoPages.clear();
+    this.releaseAllLocks();
   }
   /**
    * Rolls back the transaction.
@@ -9338,6 +9373,19 @@ var DataplyAPI = class {
       return this.textCodec.decode(data);
     }, tx);
   }
+  async selectMany(pks, asRaw = false, tx) {
+    if (!this.initialized) {
+      throw new Error("Dataply instance is not initialized");
+    }
+    return this.runWithDefault(async (tx2) => {
+      const results = await this.rowTableEngine.selectMany(pks, tx2);
+      return results.map((data) => {
+        if (data === null) return null;
+        if (asRaw) return data;
+        return this.textCodec.decode(data);
+      });
+    }, tx);
+  }
   /**
    * Closes the dataply file.
    */
@@ -9428,6 +9476,9 @@ var Dataply = class {
   async select(pk, asRaw = false, tx) {
     return this.api.select(pk, asRaw, tx);
   }
+  async selectMany(pks, asRaw = false, tx) {
+    return this.api.selectMany(pks, asRaw, tx);
+  }
   /**
    * Closes the dataply file.
    */

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

@@ -68,6 +68,16 @@ export declare class Dataply {
     select(pk: number, asRaw: true, tx?: Transaction): Promise<Uint8Array | null>;
     select(pk: number, asRaw: false, tx?: Transaction): Promise<string | null>;
     select(pk: number, asRaw?: boolean, tx?: Transaction): Promise<string | null>;
+    /**
+     * Selects multiple data by their PKs.
+     * @param pks Array of PKs to select
+     * @param asRaw Whether to return the selected data as raw
+     * @param tx Transaction
+     * @returns Array of selected data in the same order as input PKs
+     */
+    selectMany(pks: number[], asRaw: true, tx?: Transaction): Promise<(Uint8Array | null)[]>;
+    selectMany(pks: number[], asRaw: false, tx?: Transaction): Promise<(string | null)[]>;
+    selectMany(pks: number[], asRaw?: boolean, tx?: Transaction): Promise<(string | null)[]>;
     /**
      * Closes the dataply file.
      */

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

@@ -157,6 +157,16 @@ export declare class DataplyAPI {
     select(pk: number, asRaw: true, tx?: Transaction): Promise<Uint8Array | null>;
     select(pk: number, asRaw: false, tx?: Transaction): Promise<string | null>;
     select(pk: number, asRaw?: boolean, tx?: Transaction): Promise<string | null>;
+    /**
+     * Selects multiple data by their PKs.
+     * @param pks Array of PKs to select
+     * @param asRaw Whether to return the selected data as raw
+     * @param tx Transaction
+     * @returns Array of selected data in the same order as input PKs
+     */
+    selectMany(pks: number[], asRaw: true, tx?: Transaction): Promise<(Uint8Array | null)[]>;
+    selectMany(pks: number[], asRaw: false, tx?: Transaction): Promise<(string | null)[]>;
+    selectMany(pks: number[], asRaw?: boolean, tx?: Transaction): Promise<(string | null)[]>;
     /**
      * Closes the dataply file.
      */

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

@@ -1,5 +1,4 @@
 import type { IndexPage, MetadataPage, DataplyOptions } from '../types';
-import { Ryoiki } from 'ryoiki';
 import type { Transaction } from './transaction/Transaction';
 import { PageManagerFactory } from './Page';
 import { WALManager } from './WALManager';
@@ -17,18 +16,23 @@ export declare class PageFileSystem {
     protected readonly walManager: WALManager | null;
     protected readonly pageManagerFactory: PageManagerFactory;
     protected readonly pageStrategy: PageMVCCStrategy;
-    protected readonly lock: Ryoiki;
+    /** 글로벌 동기화(체크포인트/커밋)를 위한 Mutex */
+    private lockPromise;
     /**
      * @param pageCacheCapacity 페이지 캐시 크기
      * @param options 데이터플라이 옵션
      */
     constructor(fileHandle: number, pageSize: number, pageCacheCapacity: number, options: Required<DataplyOptions>);
+    /**
+     * 글로벌 동기화 범위 내에서 작업을 실행합니다.
+     * @param task 수행할 비동기 작업
+     */
+    runGlobalLock<T>(task: () => Promise<T>): Promise<T>;
     /**
      * Initializes the page file system.
      * Performs WAL recovery if necessary.
      */
     init(): Promise<void>;
-    lockCheckpoint(fn: () => Promise<void>): Promise<void>;
     /**
      * Returns the page strategy for transaction use.
      */

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

@@ -123,6 +123,13 @@ export declare class RowTableEngine {
      * @returns Raw data of the row
      */
     selectByPK(pk: number, tx: Transaction): Promise<Uint8Array | null>;
+    /**
+     * Selects multiple rows by their PKs in a single B+ Tree traversal.
+     * @param pks Array of PKs to look up
+     * @param tx Transaction
+     * @returns Array of raw data of the rows in the same order as input PKs
+     */
+    selectMany(pks: number[], tx: Transaction): Promise<(Uint8Array | null)[]>;
     private fetchRowByRid;
     /**
      * Returns the count of rows.

package/package.json

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