dataply 0.0.22-alpha.2 → 0.0.22-alpha.4

package/dist/cjs/index.js

@@ -375,6 +375,30 @@ var MVCCTransaction = class {
       deleted
     };
   }
+  /**
+   * Checks for conflicts among multiple transactions.
+   * A conflict occurs if two or more transactions modify (write or delete) the same key.
+   * @param transactions Array of transactions to check.
+   * @returns An array of keys that are in conflict.
+   */
+  static CheckConflicts(transactions) {
+    const modifiedKeys = /* @__PURE__ */ new Map();
+    const conflicts = /* @__PURE__ */ new Set();
+    for (const tx of transactions) {
+      const txModified = /* @__PURE__ */ new Set([
+        ...tx.writeBuffer.keys(),
+        ...tx.deleteBuffer
+      ]);
+      for (const key of txModified) {
+        const count = modifiedKeys.get(key) ?? 0;
+        if (count > 0) {
+          conflicts.add(key);
+        }
+        modifiedKeys.set(key, count + 1);
+      }
+    }
+    return Array.from(conflicts);
+  }
   /**
    * Cleans up both deletedCache and versionIndex based on minActiveVersion.
    * Root transactions call this after commit to reclaim memory.
@@ -1662,6 +1686,15 @@ var BPTreeTransaction = class _BPTreeTransaction {
     }
     return best;
   }
+  /**
+   * Checks for conflicts between multiple transactions.
+   * 
+   * @param transactions Array of BPTreeTransaction instances to check
+   * @returns An array of keys that are in conflict. Empty array if no conflicts.
+   */
+  static CheckConflicts(transactions) {
+    return MVCCTransaction.CheckConflicts(transactions.map((tx) => tx.mvcc));
+  }
   /**
    * Returns the ID of the root node.
    * @returns The root node ID.
@@ -2112,11 +2145,7 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
         const { root, order } = head;
         this.strategy.head = head;
         this.order = order;
-        this._writeHead({
-          root,
-          order: this.order,
-          data: this.strategy.head.data
-        });
+        this.rootId = root;
       }
       if (this.order < 3) {
         throw new Error(`The 'order' parameter must be greater than 2. but got a '${this.order}'.`);
@@ -2442,6 +2471,12 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
     return node;
   }
   delete(key, value) {
+    if (value === void 0) {
+      value = this.get(key);
+    }
+    if (value === void 0) {
+      return;
+    }
     let node = this.insertableNodeByPrimary(value);
     let found = false;
     while (true) {
@@ -2495,15 +2530,13 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
   commit(label) {
     let result = this.mvcc.commit(label);
     if (result.success) {
-      const isRootTx = this.rootTx !== this;
-      if (isRootTx) {
+      const isRootTx = this.rootTx === this;
+      if (!isRootTx) {
         result = this.rootTx.commit(label);
         if (result.success) {
           this.rootTx.rootId = this.rootId;
         }
       }
-      if (result.success) {
-      }
     }
     return result;
   }
@@ -2887,14 +2920,6 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
       next,
       prev
     };
-    const head = await this._readHead();
-    if (head) {
-      await this._writeHead({
-        root: head.root,
-        order: head.order,
-        data: this.strategy.head.data
-      });
-    }
     await this.mvcc.create(id, node);
     return node;
   }
@@ -3187,11 +3212,7 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
         const { root, order } = head;
         this.strategy.head = head;
         this.order = order;
-        await this._writeHead({
-          root,
-          order: this.order,
-          data: this.strategy.head.data
-        });
+        this.rootId = root;
       }
       if (this.order < 3) {
         throw new Error(`The 'order' parameter must be greater than 2. but got a '${this.order}'.`);
@@ -3520,6 +3541,12 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
   }
   async delete(key, value) {
     return this.writeLock(0, async () => {
+      if (value === void 0) {
+        value = await this.get(key);
+      }
+      if (value === void 0) {
+        return;
+      }
       let node = await this.insertableNodeByPrimary(value);
       let found = false;
       while (true) {
@@ -4761,6 +4788,30 @@ var MVCCTransaction2 = class {
       deleted
     };
   }
+  /**
+   * Checks for conflicts among multiple transactions.
+   * A conflict occurs if two or more transactions modify (write or delete) the same key.
+   * @param transactions Array of transactions to check.
+   * @returns An array of keys that are in conflict.
+   */
+  static CheckConflicts(transactions) {
+    const modifiedKeys = /* @__PURE__ */ new Map();
+    const conflicts = /* @__PURE__ */ new Set();
+    for (const tx of transactions) {
+      const txModified = /* @__PURE__ */ new Set([
+        ...tx.writeBuffer.keys(),
+        ...tx.deleteBuffer
+      ]);
+      for (const key of txModified) {
+        const count = modifiedKeys.get(key) ?? 0;
+        if (count > 0) {
+          conflicts.add(key);
+        }
+        modifiedKeys.set(key, count + 1);
+      }
+    }
+    return Array.from(conflicts);
+  }
   /**
    * Cleans up both deletedCache and versionIndex based on minActiveVersion.
    * Root transactions call this after commit to reclaim memory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.22-alpha.2",
+  "version": "0.0.22-alpha.4",
   "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.3.3",
+    "mvcc-api": "^1.3.4",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^8.1.5"
+    "serializable-bptree": "^8.1.7"
   }
-}
+}