corebasic 1.0.182 → 1.0.183

package/libs/dip.js

@@ -8,10 +8,10 @@ export const query = Elabase.query
 export const update = Elabase.update
 export const remove = Elabase.remove
 
-export const transactionBegin = Elabase.transactionBegin
-export const transactionAbort = Elabase.transactionAbort
-export const transactionReset = Elabase.transactionReset
-export const transactionCommit = Elabase.transactionCommit
+export const batchBegin = Elabase.batchBegin
+export const batchAbort = Elabase.batchAbort
+export const batchReset = Elabase.batchReset
+export const batchSubmit = Elabase.batchSubmit
 
 export const shard_stats = Elabase.shard_stats
 export let config = Elabase.config

package/libs/elabase.js

@@ -112,25 +112,26 @@ function generate_suffix(meta) {
     return suffixes
 }
 
-let isBranch = false
-let batches = []
+let BATCH_COUNTER = 0n;
+let batches = {}
 
 export function batchBegin() {
-    isBranch = true
-    batches = []
+    const uid = ++BATCH_COUNTER; // Safe. No skew in async ++BATCH_COUNTER as single thread and ++COUNTER is atomic in event loop sense. ⚠️ Only breaks on worker_threads or cluster (multi-process)
+    batches[uid] = []
+    return uid
 }
-export function batchAbort() {
-    isBranch = false
-    batches = []
+export function batchAbort(batch_id) {
+    delete batches[batch_id]
 }
 export function batchReset() {
     batchAbort()
 }
-export function batchSubmit(arg) {
-    let txns = batches
-    let mode = batches.some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
-    isBranch = false
-    batches = []
+export function batchSubmit(batch_id, arg) {
+    if (!batch_id || !batches[batch_id] || !batches[batch_id].length)
+        throw {message: `Error: Invalid batch in Dip.batchSubmit()`}
+    let txns = batches[batch_id]
+    let mode = batches[batch_id].some(txn => txn.insert || txn.update || txn.delete) ? "command" : "query"
+    delete batches[batch_id]
     return new Promise((resolve, reject) => resolve())
     .then(() => execute({ "batch": txns, mode, version: arg?.version, compression: arg?.compression }))
     .then (result => {
@@ -167,8 +168,10 @@ export const insert = async (meta, collection, value, _id, extras) => {
         throw {message: "Error: invalid _id in Dip.insert()"}
 
 
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.insert()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"
@@ -195,8 +198,10 @@ export const query = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.query()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "query"
@@ -238,8 +243,10 @@ export const update = async (meta, collection, query, update, options, extras) =
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.update()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"
@@ -270,8 +277,10 @@ export const remove = async (meta, collection, query, options, extras) => {
         ...(meta.DIP_DB ? {db: meta.DIP_DB} : {}),
     }
     arg = Object.assign(arg, extras)
-    if (isBranch) {
-        batches.push(arg)
+    if (meta.batch) {
+        if (!batches[meta.batch])
+            throw {message: 'Error: Invalid batch in Dip.query()'}
+        batches[meta.batch].push(arg)
         return
     }
     arg.mode = "command"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.182",
+  "version": "1.0.183",
   "description": "",
   "main": "index.js",
   "scripts": {