dataply 0.0.26-alpha.3 → 0.0.26-alpha.4

package/dist/cjs/index.js

@@ -447,11 +447,7 @@ var MVCCTransaction = class {
    */
   rollback() {
     const { created, updated, deleted } = this.getResultEntries();
-    this.writeBuffer.clear();
-    this.deleteBuffer.clear();
-    this.createdKeys.clear();
-    this.deletedValues.clear();
-    this.originallyExisted.clear();
+    this._cleanupAll();
     this.committed = true;
     if (this.root !== this) {
       this.root.activeTransactions.delete(this);
@@ -487,6 +483,19 @@ var MVCCTransaction = class {
     }
     return Array.from(conflicts);
   }
+  /**
+   * Cleans up all buffers and history.
+   * This method is called by the commit method.
+   */
+  _cleanupAll() {
+    this.writeBuffer.clear();
+    this.deleteBuffer.clear();
+    this.createdKeys.clear();
+    this.deletedValues.clear();
+    this.originallyExisted.clear();
+    this.keyVersions.clear();
+    this.bufferHistory.clear();
+  }
   /**
    * Cleans up both deletedCache and versionIndex based on minActiveVersion.
    * Root transactions call this after commit to reclaim memory.
@@ -678,6 +687,7 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
     if (this.parent) {
       const failure = this.parent._merge(this);
       if (failure) {
+        this.rollback();
         return {
           label,
           success: false,
@@ -688,11 +698,13 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
           deleted
         };
       }
+      this._cleanupAll();
       this.committed = true;
     } else {
       if (this.writeBuffer.size > 0 || this.deleteBuffer.size > 0) {
         const failure = this._merge(this);
         if (failure) {
+          this.rollback();
           return {
             label,
             success: false,
@@ -703,13 +715,7 @@ var SyncMVCCTransaction = class _SyncMVCCTransaction extends MVCCTransaction {
             deleted: []
           };
         }
-        this.writeBuffer.clear();
-        this.deleteBuffer.clear();
-        this.createdKeys.clear();
-        this.deletedValues.clear();
-        this.originallyExisted.clear();
-        this.keyVersions.clear();
-        this.bufferHistory.clear();
+        this._cleanupAll();
         this.localVersion = 0;
         this.snapshotVersion = this.version;
       }
@@ -1343,6 +1349,7 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
     if (this.parent) {
       const failure = await this.parent._merge(this);
       if (failure) {
+        this.rollback();
         return {
           label,
           success: false,
@@ -1353,11 +1360,13 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
           deleted
         };
       }
+      this._cleanupAll();
       this.committed = true;
     } else {
       if (this.writeBuffer.size > 0 || this.deleteBuffer.size > 0) {
         const failure = await this._merge(this);
         if (failure) {
+          this.rollback();
           return {
             label,
             success: false,
@@ -1368,13 +1377,7 @@ var AsyncMVCCTransaction = class _AsyncMVCCTransaction extends MVCCTransaction {
             deleted: []
           };
         }
-        this.writeBuffer.clear();
-        this.deleteBuffer.clear();
-        this.createdKeys.clear();
-        this.deletedValues.clear();
-        this.originallyExisted.clear();
-        this.keyVersions.clear();
-        this.bufferHistory.clear();
+        this._cleanupAll();
         this.localVersion = 0;
         this.snapshotVersion = this.version;
       }
@@ -2929,8 +2932,12 @@ var BPTreeSyncTransaction = class extends BPTreeTransaction {
         result = this.rootTx.commit(label);
         if (result.success) {
           this.rootTx.rootId = this.rootId;
+        } else {
+          this.mvcc.rollback();
         }
       }
+    } else {
+      this.mvcc.rollback();
     }
     return result;
   }
@@ -4131,8 +4138,12 @@ var BPTreeAsyncTransaction = class extends BPTreeTransaction {
         result = await this.rootTx.commit(label);
         if (result.success) {
           this.rootTx.rootId = this.rootId;
+        } else {
+          this.mvcc.rollback();
         }
       }
+    } else {
+      this.mvcc.rollback();
     }
     return result;
   }
@@ -5403,11 +5414,7 @@ var MVCCTransaction2 = class {
    */
   rollback() {
     const { created, updated, deleted } = this.getResultEntries();
-    this.writeBuffer.clear();
-    this.deleteBuffer.clear();
-    this.createdKeys.clear();
-    this.deletedValues.clear();
-    this.originallyExisted.clear();
+    this._cleanupAll();
     this.committed = true;
     if (this.root !== this) {
       this.root.activeTransactions.delete(this);
@@ -5443,6 +5450,19 @@ var MVCCTransaction2 = class {
     }
     return Array.from(conflicts);
   }
+  /**
+   * Cleans up all buffers and history.
+   * This method is called by the commit method.
+   */
+  _cleanupAll() {
+    this.writeBuffer.clear();
+    this.deleteBuffer.clear();
+    this.createdKeys.clear();
+    this.deletedValues.clear();
+    this.originallyExisted.clear();
+    this.keyVersions.clear();
+    this.bufferHistory.clear();
+  }
   /**
    * Cleans up both deletedCache and versionIndex based on minActiveVersion.
    * Root transactions call this after commit to reclaim memory.
@@ -5634,6 +5654,7 @@ var SyncMVCCTransaction2 = class _SyncMVCCTransaction2 extends MVCCTransaction2
     if (this.parent) {
       const failure = this.parent._merge(this);
       if (failure) {
+        this.rollback();
         return {
           label,
           success: false,
@@ -5644,11 +5665,13 @@ var SyncMVCCTransaction2 = class _SyncMVCCTransaction2 extends MVCCTransaction2
           deleted
         };
       }
+      this._cleanupAll();
       this.committed = true;
     } else {
       if (this.writeBuffer.size > 0 || this.deleteBuffer.size > 0) {
         const failure = this._merge(this);
         if (failure) {
+          this.rollback();
           return {
             label,
             success: false,
@@ -5659,13 +5682,7 @@ var SyncMVCCTransaction2 = class _SyncMVCCTransaction2 extends MVCCTransaction2
             deleted: []
           };
         }
-        this.writeBuffer.clear();
-        this.deleteBuffer.clear();
-        this.createdKeys.clear();
-        this.deletedValues.clear();
-        this.originallyExisted.clear();
-        this.keyVersions.clear();
-        this.bufferHistory.clear();
+        this._cleanupAll();
         this.localVersion = 0;
         this.snapshotVersion = this.version;
       }
@@ -6299,6 +6316,7 @@ var AsyncMVCCTransaction2 = class _AsyncMVCCTransaction2 extends MVCCTransaction
     if (this.parent) {
       const failure = await this.parent._merge(this);
       if (failure) {
+        this.rollback();
         return {
           label,
           success: false,
@@ -6309,11 +6327,13 @@ var AsyncMVCCTransaction2 = class _AsyncMVCCTransaction2 extends MVCCTransaction
           deleted
         };
       }
+      this._cleanupAll();
       this.committed = true;
     } else {
       if (this.writeBuffer.size > 0 || this.deleteBuffer.size > 0) {
         const failure = await this._merge(this);
         if (failure) {
+          this.rollback();
           return {
             label,
             success: false,
@@ -6324,13 +6344,7 @@ var AsyncMVCCTransaction2 = class _AsyncMVCCTransaction2 extends MVCCTransaction
             deleted: []
           };
         }
-        this.writeBuffer.clear();
-        this.deleteBuffer.clear();
-        this.createdKeys.clear();
-        this.deletedValues.clear();
-        this.originallyExisted.clear();
-        this.keyVersions.clear();
-        this.bufferHistory.clear();
+        this._cleanupAll();
         this.localVersion = 0;
         this.snapshotVersion = this.version;
       }
@@ -9984,10 +9998,10 @@ var Transaction = class {
       if (shouldTriggerCheckpoint) {
         await this.pfs.checkpoint();
       }
+    } finally {
       this.dirtyPages.clear();
       this.undoPages.clear();
       this.releaseAllLocks();
-    } finally {
       if (this._writeLockRelease) {
         this._writeLockRelease();
         this._writeLockRelease = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.26-alpha.3",
+  "version": "0.0.26-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.5",
+    "mvcc-api": "^1.3.6",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^8.4.0"
+    "serializable-bptree": "^8.4.1"
   }
-}
+}