document-dataply 0.0.9-alpha.7 → 0.0.9-alpha.9

package/dist/cjs/index.js

@@ -873,7 +873,7 @@ var require_cjs = __commonJS({
     };
     var AsyncMVCCStrategy = class extends MVCCStrategy {
     };
-    var Ryoiki2 = class _Ryoiki {
+    var Ryoiki = class _Ryoiki {
       readings;
       writings;
       readQueue;
@@ -1130,7 +1130,7 @@ var require_cjs = __commonJS({
       }
     };
     var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
-      lock = new Ryoiki2();
+      lock = new Ryoiki();
       async writeLock(fn) {
         let lockId;
         return this.lock.writeLock(async (_lockId) => {
@@ -2890,7 +2890,7 @@ var require_cjs = __commonJS({
         }
       }
     };
-    var Ryoiki22 = class _Ryoiki2 {
+    var Ryoiki2 = class _Ryoiki2 {
       readings;
       writings;
       readQueue;
@@ -3157,7 +3157,7 @@ var require_cjs = __commonJS({
           comparator,
           option
         );
-        this.lock = new Ryoiki22();
+        this.lock = new Ryoiki2();
       }
       async writeLock(id, fn) {
         let lockId;
@@ -4099,7 +4099,7 @@ var require_cjs = __commonJS({
       }
     };
     var SerializeStrategyAsync2 = class extends SerializeStrategy {
-      lock = new Ryoiki22();
+      lock = new Ryoiki2();
       async acquireLock(action) {
         let lockId;
         return this.lock.writeLock((_lockId) => {
@@ -8499,7 +8499,6 @@ var require_cjs = __commonJS({
           const nextFreePageId = reusedPageManager.getNextPageId(reusedPage);
           metadataManager.setFreePageId(metadata, nextFreePageId);
           await this.setPage(0, metadata, tx);
-          await this.updateBitmap(reusedPageId, false, tx);
           const manager2 = this.pageFactory.getManagerFromType(pageType);
           const newPage2 = manager2.create(this.pageSize, reusedPageId);
           await this.setPage(reusedPageId, newPage2, tx);
@@ -8515,18 +8514,17 @@ var require_cjs = __commonJS({
         const emptyManager = this.pageFactory.getManagerFromType(PageManager.CONSTANT.PAGE_TYPE_EMPTY);
         const firstFreeIndex = newPageIndex + 1;
         const lastFreeIndex = newPageIndex + preallocationCount - 1;
+        metadataManager.setPageCount(metadata, newTotalCount);
+        if (preallocationCount > 1) {
+          metadataManager.setFreePageId(metadata, firstFreeIndex);
+        }
+        await this.setPage(0, metadata, tx);
         for (let i = firstFreeIndex; i <= lastFreeIndex; i++) {
           const emptyPage = emptyManager.create(this.pageSize, i);
           const nextId = i < lastFreeIndex ? i + 1 : -1;
           emptyManager.setNextPageId(emptyPage, nextId);
           await this.setPage(i, emptyPage, tx);
-          await this.updateBitmap(i, true, tx);
         }
-        if (preallocationCount > 1) {
-          metadataManager.setFreePageId(metadata, firstFreeIndex);
-        }
-        metadataManager.setPageCount(metadata, newTotalCount);
-        await this.setPage(0, metadata, tx);
         return newPageIndex;
       }
       /**
@@ -8623,7 +8621,6 @@ var require_cjs = __commonJS({
         const emptyPage = emptyPageManager.create(this.pageSize, pageId);
         emptyPageManager.setNextPageId(emptyPage, currentHeadFreePageId);
         await this.setPage(pageId, emptyPage, tx);
-        await this.updateBitmap(pageId, true, tx);
         metadataManager.setFreePageId(metadata, pageId);
         await this.setPage(0, metadata, tx);
       }
@@ -9460,6 +9457,8 @@ var require_cjs = __commonJS({
       commitHooks = [];
       /** Page MVCC Strategy for disk access */
       pageStrategy;
+      /** Release function for global write lock, set by DataplyAPI */
+      _writeLockRelease = null;
       /**
        * Sets the BPTree transaction.
        * @param tx BPTree transaction
@@ -9494,6 +9493,19 @@ var require_cjs = __commonJS({
       onCommit(hook) {
         this.commitHooks.push(hook);
       }
+      /**
+       * Sets the global write lock release function.
+       * Called by DataplyAPI.runWithDefaultWrite when acquiring the lock.
+       */
+      __setWriteLockRelease(release) {
+        this._writeLockRelease = release;
+      }
+      /**
+       * Returns whether this transaction already has a write lock.
+       */
+      __hasWriteLockRelease() {
+        return this._writeLockRelease !== null;
+      }
       /**
        * Reads a page. Uses dirty buffer if available, otherwise disk.
        * @param pageId Page ID
@@ -9539,44 +9551,58 @@ var require_cjs = __commonJS({
        * Commits the transaction.
        */
       async commit() {
-        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();
-          }
-          for (const [pageId, data] of this.dirtyPages) {
-            await this.pageStrategy.write(pageId, data);
-          }
-          if (this.pfs.wal) {
-            this.pfs.wal.incrementWrittenPages(this.dirtyPages.size);
-            if (this.pfs.wal.shouldCheckpoint(this.pfs.options.walCheckpointThreshold)) {
-              shouldTriggerCheckpoint = true;
+        try {
+          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();
+            }
+            for (const [pageId, data] of this.dirtyPages) {
+              await this.pageStrategy.write(pageId, data);
+            }
+            if (this.pfs.wal) {
+              this.pfs.wal.incrementWrittenPages(this.dirtyPages.size);
+              if (this.pfs.wal.shouldCheckpoint(this.pfs.options.walCheckpointThreshold)) {
+                shouldTriggerCheckpoint = true;
+              }
+            }
+          });
+          if (shouldTriggerCheckpoint) {
+            await this.pfs.checkpoint();
+          }
+          this.dirtyPages.clear();
+          this.undoPages.clear();
+          this.releaseAllLocks();
+        } finally {
+          if (this._writeLockRelease) {
+            this._writeLockRelease();
+            this._writeLockRelease = null;
           }
-        });
-        if (shouldTriggerCheckpoint) {
-          await this.pfs.checkpoint();
         }
-        this.dirtyPages.clear();
-        this.undoPages.clear();
-        this.releaseAllLocks();
       }
       /**
        * Rolls back the transaction.
        */
       async rollback() {
-        if (this.bptreeTx) {
-          this.bptreeTx.rollback();
+        try {
+          if (this.bptreeTx) {
+            this.bptreeTx.rollback();
+          }
+          this.dirtyPages.clear();
+          this.undoPages.clear();
+          this.releaseAllLocks();
+        } finally {
+          if (this._writeLockRelease) {
+            this._writeLockRelease();
+            this._writeLockRelease = null;
+          }
         }
-        this.dirtyPages.clear();
-        this.undoPages.clear();
-        this.releaseAllLocks();
       }
       /**
        * Returns the dirty pages map.
@@ -9653,6 +9679,8 @@ var require_cjs = __commonJS({
       /** Whether the database was created this time. */
       isNewlyCreated;
       txIdCounter;
+      /** Promise-chain mutex for serializing write operations */
+      writeQueue = Promise.resolve();
       /**
        * Verifies if the page file is a valid Dataply file.
        * The metadata page must be located at the beginning of the Dataply file.
@@ -9810,6 +9838,52 @@ var require_cjs = __commonJS({
        * @param tx The transaction to use. If not provided, a new transaction is created.
        * @returns The result of the callback function.
        */
+      /**
+       * Acquires the global write lock.
+       * Returns a release function that MUST be called to unlock.
+       * Used internally by runWithDefaultWrite.
+       * @returns A release function
+       */
+      acquireWriteLock() {
+        const previous = this.writeQueue;
+        let release;
+        this.writeQueue = new Promise((resolve) => {
+          release = resolve;
+        });
+        return previous.then(() => release);
+      }
+      /**
+       * Runs a write callback within a transaction context with global write serialization.
+       * If no transaction is provided, a new transaction is created, committed on success, rolled back on error.
+       * If a transaction is provided (external), the write lock is acquired on first call and held until commit/rollback.
+       * Subclasses MUST use this method for all write operations instead of runWithDefault.
+       * @param callback The callback function to run.
+       * @param tx Optional external transaction.
+       * @returns The result of the callback.
+       */
+      async runWithDefaultWrite(callback, tx) {
+        if (!tx) {
+          const release = await this.acquireWriteLock();
+          const internalTx = this.createTransaction();
+          internalTx.__setWriteLockRelease(release);
+          const [error2, result2] = await catchPromise2(this.txContext.run(internalTx, () => callback(internalTx)));
+          if (error2) {
+            await internalTx.rollback();
+            throw error2;
+          }
+          await internalTx.commit();
+          return result2;
+        }
+        if (!tx.__hasWriteLockRelease()) {
+          const release = await this.acquireWriteLock();
+          tx.__setWriteLockRelease(release);
+        }
+        const [error, result] = await catchPromise2(this.txContext.run(tx, () => callback(tx)));
+        if (error) {
+          throw error;
+        }
+        return result;
+      }
       async runWithDefault(callback, tx) {
         const isInternalTx = !tx;
         if (!tx) {
@@ -9881,7 +9955,7 @@ var require_cjs = __commonJS({
         if (!this.initialized) {
           throw new Error("Dataply instance is not initialized");
         }
-        return this.runWithDefault(async (tx2) => {
+        return this.runWithDefaultWrite(async (tx2) => {
           incrementRowCount = incrementRowCount ?? true;
           if (typeof data === "string") {
             data = this.textCodec.encode(data);
@@ -9901,7 +9975,7 @@ var require_cjs = __commonJS({
         if (!this.initialized) {
           throw new Error("Dataply instance is not initialized");
         }
-        return this.runWithDefault(async (tx2) => {
+        return this.runWithDefaultWrite(async (tx2) => {
           incrementRowCount = incrementRowCount ?? true;
           if (typeof data === "string") {
             data = this.textCodec.encode(data);
@@ -9922,7 +9996,7 @@ var require_cjs = __commonJS({
         if (!this.initialized) {
           throw new Error("Dataply instance is not initialized");
         }
-        return this.runWithDefault(async (tx2) => {
+        return this.runWithDefaultWrite(async (tx2) => {
           incrementRowCount = incrementRowCount ?? true;
           const encodedList = dataList.map(
             (data) => typeof data === "string" ? this.textCodec.encode(data) : data
@@ -9940,7 +10014,7 @@ var require_cjs = __commonJS({
         if (!this.initialized) {
           throw new Error("Dataply instance is not initialized");
         }
-        return this.runWithDefault(async (tx2) => {
+        return this.runWithDefaultWrite(async (tx2) => {
           if (typeof data === "string") {
             data = this.textCodec.encode(data);
           }
@@ -9957,7 +10031,7 @@ var require_cjs = __commonJS({
         if (!this.initialized) {
           throw new Error("Dataply instance is not initialized");
         }
-        return this.runWithDefault(async (tx2) => {
+        return this.runWithDefaultWrite(async (tx2) => {
           decrementRowCount = decrementRowCount ?? true;
           await this.rowTableEngine.delete(pk, decrementRowCount, tx2);
         }, tx);
@@ -10378,7 +10452,6 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
   trees = /* @__PURE__ */ new Map();
   comparator = new DocumentValueComparator();
   pendingBackfillFields = [];
-  lock;
   _initialized = false;
   indexedFields;
   /**
@@ -10409,7 +10482,6 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
   constructor(file, options) {
     super(file, options);
     this.trees = /* @__PURE__ */ new Map();
-    this.lock = new import_dataply3.Ryoiki();
     this.indexedFields = /* @__PURE__ */ new Set(["_id"]);
     this.hook.onceAfter("init", async (tx, isNewlyCreated) => {
       if (isNewlyCreated) {
@@ -10514,7 +10586,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       const existing = this.registeredIndices.get(name);
       if (JSON.stringify(existing) === JSON.stringify(config)) return;
     }
-    await this.runWithDefault(async (tx2) => {
+    await this.runWithDefaultWrite(async (tx2) => {
       const metadata = await this.getDocumentInnerMetadata(tx2);
       metadata.indices[name] = [-1, config];
       await this.updateDocumentInnerMetadata(metadata, tx2);
@@ -10562,7 +10634,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
     if (!this.registeredIndices.has(name)) {
       throw new Error(`Index '${name}' does not exist`);
     }
-    await this.runWithDefault(async (tx2) => {
+    await this.runWithDefaultWrite(async (tx2) => {
       const config = this.registeredIndices.get(name);
       const metadata = await this.getDocumentInnerMetadata(tx2);
       delete metadata.indices[name];
@@ -10697,24 +10769,6 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
       return JSON.parse(row);
     }, tx);
   }
-  async readLock(fn) {
-    let lockId;
-    return this.lock.readLock(async (_lockId) => {
-      lockId = _lockId;
-      return await fn();
-    }).finally(() => {
-      this.lock.readUnlock(lockId);
-    });
-  }
-  async writeLock(fn) {
-    let lockId;
-    return this.lock.writeLock(async (_lockId) => {
-      lockId = _lockId;
-      return await fn();
-    }).finally(() => {
-      this.lock.writeUnlock(lockId);
-    });
-  }
   /**
    * Backfill indices for newly created indices after data was inserted.
    * This method should be called after `init()`.
@@ -10722,7 +10776,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns Number of documents that were backfilled
    */
   async backfillIndices(tx) {
-    return this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       if (this.pendingBackfillFields.length === 0) {
         return 0;
       }
@@ -10900,7 +10954,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @param tx Optional transaction
    */
   async migration(version, callback, tx) {
-    await this.runWithDefault(async (tx2) => {
+    await this.runWithDefaultWrite(async (tx2) => {
       const innerMetadata = await this.getDocumentInnerMetadata(tx2);
       const currentVersion = innerMetadata.schemeVersion ?? 0;
       if (currentVersion < version) {
@@ -11213,7 +11267,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The primary key of the inserted document
    */
   async insertSingleDocument(document, tx) {
-    return this.writeLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       const { pk: dpk, document: dataplyDocument } = await this.insertDocumentInternal(document, tx2);
       const flattenDocument = this.flattenDocument(dataplyDocument);
       for (const [indexName, config] of this.registeredIndices) {
@@ -11239,7 +11293,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         }
       }
       return dataplyDocument._id;
-    }, tx));
+    }, tx);
   }
   /**
    * Insert a batch of documents into the database
@@ -11248,7 +11302,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The primary keys of the inserted documents
    */
   async insertBatchDocuments(documents, tx) {
-    return this.writeLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       const metadata = await this.getDocumentInnerMetadata(tx2);
       const startId = metadata.lastId + 1;
       metadata.lastId += documents.length;
@@ -11307,7 +11361,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         }
       }
       return ids;
-    }, tx));
+    }, tx);
   }
   /**
    * Internal update method used by both fullUpdate and partialUpdate
@@ -11388,12 +11442,12 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The number of updated documents
    */
   async fullUpdate(query, newRecord, tx) {
-    return await this.writeLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       return this.updateInternal(query, (doc) => {
         const newDoc = typeof newRecord === "function" ? newRecord(doc) : newRecord;
         return { _id: doc._id, ...newDoc };
       }, tx2);
-    }, tx));
+    }, tx);
   }
   /**
    * Partially update documents from the database that match the query
@@ -11403,14 +11457,14 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The number of updated documents
    */
   async partialUpdate(query, newRecord, tx) {
-    return this.writeLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       return this.updateInternal(query, (doc) => {
         const partialUpdateContent = typeof newRecord === "function" ? newRecord(doc) : newRecord;
         const finalUpdate = { ...partialUpdateContent };
         delete finalUpdate._id;
         return { ...doc, ...finalUpdate };
       }, tx2);
-    }, tx));
+    }, tx);
   }
   /**
    * Delete documents from the database that match the query
@@ -11419,7 +11473,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The number of deleted documents
    */
   async deleteDocuments(query, tx) {
-    return this.writeLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefaultWrite(async (tx2) => {
       const pks = await this.getKeys(query);
       let deletedCount = 0;
       for (let i = 0, len = pks.length; i < len; i++) {
@@ -11449,7 +11503,7 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
         deletedCount++;
       }
       return deletedCount;
-    }, tx));
+    }, tx);
   }
   /**
    * Count documents from the database that match the query
@@ -11458,10 +11512,10 @@ var DocumentDataplyAPI = class extends import_dataply3.DataplyAPI {
    * @returns The number of documents that match the query
    */
   async countDocuments(query, tx) {
-    return this.readLock(() => this.runWithDefault(async (tx2) => {
+    return this.runWithDefault(async (tx2) => {
       const pks = await this.getKeys(query);
       return pks.length;
-    }, tx));
+    }, tx);
   }
   /**
    * FTS 조건에 대해 문서가 유효한지 검증합니다.

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

@@ -3,12 +3,12 @@ import { DataplyAPI, Transaction, BPTreeAsync } from 'dataply';
 import { DocumentValueComparator } from './bptree/documentComparator';
 export declare class DocumentDataplyAPI<T extends DocumentJSON> extends DataplyAPI {
     runWithDefault: <T_1>(callback: (tx: Transaction) => Promise<T_1>, tx?: Transaction) => Promise<T_1>;
+    runWithDefaultWrite: <T_1>(callback: (tx: Transaction) => Promise<T_1>, tx?: Transaction) => Promise<T_1>;
     streamWithDefault: <T_1>(callback: (tx: Transaction) => AsyncGenerator<T_1>, tx?: Transaction) => AsyncGenerator<T_1>;
     indices: DocumentDataplyInnerMetadata['indices'];
     readonly trees: Map<string, BPTreeAsync<string | number, DataplyTreeValue<Primitive>>>;
     readonly comparator: DocumentValueComparator<DataplyTreeValue<Primitive>, Primitive>;
     private pendingBackfillFields;
-    private readonly lock;
     private _initialized;
     readonly indexedFields: Set<string>;
     /**
@@ -76,8 +76,6 @@ export declare class DocumentDataplyAPI<T extends DocumentJSON> extends DataplyA
      */
     private getFtsConfig;
     getDocument(pk: number, tx?: Transaction): Promise<DataplyDocument<T>>;
-    readLock<T>(fn: () => T): Promise<T>;
-    writeLock<T>(fn: () => T): Promise<T>;
     /**
      * Backfill indices for newly created indices after data was inserted.
      * This method should be called after `init()`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-dataply",
-  "version": "0.0.9-alpha.7",
+  "version": "0.0.9-alpha.9",
   "description": "Simple and powerful JSON document database supporting complex queries and flexible indexing policies.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -42,7 +42,7 @@
     "dataply"
   ],
   "dependencies": {
-    "dataply": "^0.0.24-alpha.3"
+    "dataply": "^0.0.24-alpha.7"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",