dataply 0.0.26-alpha.12 → 0.0.26-alpha.14

package/dist/cjs/index.js

@@ -2977,27 +2977,12 @@ var BPTreeTransaction = class _BPTreeTransaction {
   static CheckConflicts(transactions) {
     return MVCCTransaction.CheckConflicts(transactions.map((tx) => tx.mvcc));
   }
-  /**
-   * Returns the ID of the root node.
-   * @returns The root node ID.
-   */
   getRootId() {
     return this.rootId;
   }
-  /**
-   * Returns the order of the B+Tree.
-   * @returns The order of the tree.
-   */
   getOrder() {
     return this.order;
   }
-  /**
-   * Verified if the value satisfies the condition.
-   * 
-   * @param nodeValue The value to verify.
-   * @param condition The condition to verify against.
-   * @returns Returns true if the value satisfies the condition.
-   */
   verify(nodeValue, condition) {
     for (const key in condition) {
       const verify2 = this.verifierMap[key];
@@ -5265,14 +5250,10 @@ var BPTreePureAsync = class {
   }
   _createReadOps() {
     const strategy = this.strategy;
-    const readBuffer = /* @__PURE__ */ new Map();
+    let headBuffer = null;
     return {
       async getNode(id) {
-        const buffered = readBuffer.get(id);
-        if (buffered) return buffered;
-        const node = await strategy.read(id);
-        readBuffer.set(id, node);
-        return node;
+        return await strategy.read(id);
       },
       async createNode(leaf, keys, values, parent = null, next = null, prev = null) {
         const id = await strategy.id(leaf);
@@ -5284,15 +5265,17 @@ var BPTreePureAsync = class {
       async deleteNode() {
       },
       async readHead() {
-        return await strategy.readHead();
+        if (headBuffer) return headBuffer;
+        headBuffer = await strategy.readHead();
+        return headBuffer;
       },
-      async writeHead() {
+      async writeHead(head) {
+        headBuffer = head;
       }
     };
   }
   _createBufferedOps() {
     const strategy = this.strategy;
-    const readBuffer = /* @__PURE__ */ new Map();
     const writeBuffer = /* @__PURE__ */ new Map();
     const deleteBuffer = /* @__PURE__ */ new Set();
     let headBuffer = null;
@@ -5300,11 +5283,7 @@ var BPTreePureAsync = class {
       async getNode(id) {
         const buffered = writeBuffer.get(id);
         if (buffered) return buffered;
-        const read = readBuffer.get(id);
-        if (read) return read;
-        const node = await strategy.read(id);
-        readBuffer.set(id, node);
-        return node;
+        return await strategy.read(id);
       },
       async createNode(leaf, keys, values, parent = null, next = null, prev = null) {
         const id = await strategy.id(leaf);
@@ -5321,7 +5300,8 @@ var BPTreePureAsync = class {
       },
       async readHead() {
         if (headBuffer) return headBuffer;
-        return await strategy.readHead();
+        headBuffer = await strategy.readHead();
+        return headBuffer;
       },
       async writeHead(head) {
         headBuffer = head;
@@ -5337,7 +5317,6 @@ var BPTreePureAsync = class {
       if (headBuffer) {
         await strategy.writeHead(headBuffer);
       }
-      readBuffer.clear();
       writeBuffer.clear();
       deleteBuffer.clear();
       headBuffer = null;
@@ -10974,11 +10953,6 @@ var RowTableEngine = class {
   }
 };
 
-// src/utils/catchPromise.ts
-async function catchPromise(promise) {
-  return promise.then((res) => [void 0, res]).catch((reason) => [reason]);
-}
-
 // src/core/transaction/LockManager.ts
 var LockManager = class {
   lock;
@@ -11514,41 +11488,41 @@ var DataplyAPI = class {
       const release = await this.acquireWriteLock();
       const internalTx = this.createTransaction();
       internalTx.__setWriteLockRelease(release);
-      const [error2, result2] = await catchPromise(this.txContext.run(internalTx, () => callback(internalTx)));
-      if (error2) {
+      try {
+        const result = await this.txContext.run(internalTx, () => callback(internalTx));
+        await internalTx.commit();
+        return result;
+      } catch (error) {
         await internalTx.rollback();
-        throw error2;
+        throw error;
       }
-      await internalTx.commit();
-      return result2;
     }
     if (!tx.__hasWriteLockRelease()) {
       const release = await this.acquireWriteLock();
       tx.__setWriteLockRelease(release);
     }
-    const [error, result] = await catchPromise(this.txContext.run(tx, () => callback(tx)));
-    if (error) {
-      throw error;
+    if (this.txContext.get() === tx) {
+      return callback(tx);
     }
-    return result;
+    return this.txContext.run(tx, () => callback(tx));
   }
   async withReadTransaction(callback, tx) {
     this.logger.debug("Running with read transaction");
-    const isInternalTx = !tx;
     if (!tx) {
-      tx = this.createTransaction();
-    }
-    const [error, result] = await catchPromise(this.txContext.run(tx, () => callback(tx)));
-    if (error) {
-      if (isInternalTx) {
-        await tx.rollback();
+      const internalTx = this.createTransaction();
+      try {
+        const result = await this.txContext.run(internalTx, () => callback(internalTx));
+        await internalTx.commit();
+        return result;
+      } catch (error) {
+        await internalTx.rollback();
+        throw error;
       }
-      throw error;
     }
-    if (isInternalTx) {
-      await tx.commit();
+    if (this.txContext.get() === tx) {
+      return callback(tx);
     }
-    return result;
+    return this.txContext.run(tx, () => callback(tx));
   }
   /**
    * Runs a generator callback function within a transaction context.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.26-alpha.12",
+  "version": "0.0.26-alpha.14",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -49,6 +49,6 @@
     "hookall": "^2.2.0",
     "mvcc-api": "^1.3.7",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^9.0.4-alpha.1"
+    "serializable-bptree": "^9.0.4-alpha.2"
   }
 }