dataply 0.0.11 → 0.0.12

package/dist/cjs/index.js

@@ -507,9 +507,15 @@ var BPTree = class {
     lt: (nv, v) => this.comparator.isLower(nv, v),
     lte: (nv, v) => this.comparator.isLower(nv, v) || this.comparator.isSame(nv, v),
     equal: (nv, v) => this.comparator.isSame(nv, v),
-    primaryEqual: (nv, v) => this.comparator.isPrimarySame(nv, v),
     notEqual: (nv, v) => this.comparator.isSame(nv, v) === false,
     or: (nv, v) => this.ensureValues(v).some((v2) => this.comparator.isSame(nv, v2)),
+    primaryGt: (nv, v) => this.comparator.isPrimaryHigher(nv, v),
+    primaryGte: (nv, v) => this.comparator.isPrimaryHigher(nv, v) || this.comparator.isPrimarySame(nv, v),
+    primaryLt: (nv, v) => this.comparator.isPrimaryLower(nv, v),
+    primaryLte: (nv, v) => this.comparator.isPrimaryLower(nv, v) || this.comparator.isPrimarySame(nv, v),
+    primaryEqual: (nv, v) => this.comparator.isPrimarySame(nv, v),
+    primaryNotEqual: (nv, v) => this.comparator.isPrimarySame(nv, v) === false,
+    primaryOr: (nv, v) => this.ensureValues(v).some((v2) => this.comparator.isPrimarySame(nv, v2)),
     like: (nv, v) => {
       const nodeValue = this.comparator.match(nv);
       const value = this.comparator.match(v);
@@ -524,9 +530,15 @@ var BPTree = class {
     lt: (v) => this.insertableNode(v),
     lte: (v) => this.insertableNode(v),
     equal: (v) => this.insertableNode(v),
-    primaryEqual: (v) => this.insertableNodeByPrimary(v),
     notEqual: (v) => this.leftestNode(),
     or: (v) => this.insertableNode(this.lowestValue(this.ensureValues(v))),
+    primaryGt: (v) => this.insertableNodeByPrimary(v),
+    primaryGte: (v) => this.insertableNodeByPrimary(v),
+    primaryLt: (v) => this.insertableNodeByPrimary(v),
+    primaryLte: (v) => this.insertableRightestNodeByPrimary(v),
+    primaryEqual: (v) => this.insertableNodeByPrimary(v),
+    primaryNotEqual: (v) => this.leftestNode(),
+    primaryOr: (v) => this.insertableNodeByPrimary(this.lowestPrimaryValue(this.ensureValues(v))),
     like: (v) => this.leftestNode()
   };
   verifierEndNode = {
@@ -535,12 +547,20 @@ var BPTree = class {
     lt: (v) => null,
     lte: (v) => null,
     equal: (v) => this.insertableEndNode(v, this.verifierDirection.equal),
-    primaryEqual: (v) => null,
     notEqual: (v) => null,
     or: (v) => this.insertableEndNode(
       this.highestValue(this.ensureValues(v)),
       this.verifierDirection.or
     ),
+    primaryGt: (v) => null,
+    primaryGte: (v) => null,
+    primaryLt: (v) => null,
+    primaryLte: (v) => null,
+    primaryEqual: (v) => null,
+    primaryNotEqual: (v) => null,
+    primaryOr: (v) => this.insertableRightestEndNodeByPrimary(
+      this.highestPrimaryValue(this.ensureValues(v))
+    ),
     like: (v) => null
   };
   verifierDirection = {
@@ -549,9 +569,15 @@ var BPTree = class {
     lt: -1,
     lte: -1,
     equal: 1,
-    primaryEqual: 1,
     notEqual: 1,
     or: 1,
+    primaryGt: 1,
+    primaryGte: 1,
+    primaryLt: -1,
+    primaryLte: -1,
+    primaryEqual: 1,
+    primaryNotEqual: 1,
+    primaryOr: 1,
     like: 1
   };
   /**
@@ -565,9 +591,15 @@ var BPTree = class {
     lt: false,
     lte: false,
     equal: true,
-    primaryEqual: true,
     notEqual: false,
     or: false,
+    primaryGt: false,
+    primaryGte: false,
+    primaryLt: false,
+    primaryLte: false,
+    primaryEqual: true,
+    primaryNotEqual: false,
+    primaryOr: false,
     like: false
   };
   constructor(strategy, comparator, option) {
@@ -603,6 +635,14 @@ var BPTree = class {
     const i = v.length - 1;
     return [...v].sort((a, b) => this.comparator.asc(a, b))[i];
   }
+  lowestPrimaryValue(v) {
+    const i = 0;
+    return [...v].sort((a, b) => this.comparator.primaryAsc(a, b))[i];
+  }
+  highestPrimaryValue(v) {
+    const i = v.length - 1;
+    return [...v].sort((a, b) => this.comparator.primaryAsc(a, b))[i];
+  }
   _insertAtLeaf(node, key, value) {
     if (node.values.length) {
       for (let i = 0, len = node.values.length; i < len; i++) {
@@ -1125,6 +1165,31 @@ var BPTreeSync = class extends BPTree {
     }
     return node;
   }
+  insertableRightestNodeByPrimary(value) {
+    let node = this.getNode(this.root.id);
+    while (!node.leaf) {
+      for (let i = 0, len = node.values.length; i < len; i++) {
+        const nValue = node.values[i];
+        const k = node.keys;
+        if (this.comparator.isPrimaryLower(value, nValue)) {
+          node = this.getNode(k[i]);
+          break;
+        }
+        if (i + 1 === node.values.length) {
+          node = this.getNode(k[i + 1]);
+          break;
+        }
+      }
+    }
+    return node;
+  }
+  insertableRightestEndNodeByPrimary(value) {
+    const node = this.insertableRightestNodeByPrimary(value);
+    if (!node.next) {
+      return null;
+    }
+    return this.getNode(node.next);
+  }
   insertableEndNode(value, direction) {
     const insertableNode = this.insertableNode(value);
     let key;
@@ -2049,6 +2114,31 @@ var BPTreeAsync = class extends BPTree {
     }
     return node;
   }
+  async insertableRightestNodeByPrimary(value) {
+    let node = await this.getNode(this.root.id);
+    while (!node.leaf) {
+      for (let i = 0, len = node.values.length; i < len; i++) {
+        const nValue = node.values[i];
+        const k = node.keys;
+        if (this.comparator.isPrimaryLower(value, nValue)) {
+          node = await this.getNode(k[i]);
+          break;
+        }
+        if (i + 1 === node.values.length) {
+          node = await this.getNode(k[i + 1]);
+          break;
+        }
+      }
+    }
+    return node;
+  }
+  async insertableRightestEndNodeByPrimary(value) {
+    const node = await this.insertableRightestNodeByPrimary(value);
+    if (!node.next) {
+      return null;
+    }
+    return await this.getNode(node.next);
+  }
   async insertableEndNode(value, direction) {
     const insertableNode = await this.insertableNode(value);
     let key;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataply",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "A lightweight storage engine for Node.js with support for MVCC, WAL.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -47,6 +47,6 @@
     "cache-entanglement": "^1.7.1",
     "hookall": "^2.2.0",
     "ryoiki": "^1.2.0",
-    "serializable-bptree": "^6.1.0"
+    "serializable-bptree": "^6.1.1"
   }
 }