document-dataply 0.0.4 → 0.0.5-alpha.0

package/dist/cjs/index.js

@@ -1877,6 +1877,25 @@ var require_cjs = __commonJS({
         this._cachedRegexp.clear();
         this.nodes.clear();
       }
+      _binarySearchValues(values, target, usePrimary = false, upperBound = false) {
+        let low = 0;
+        let high = values.length;
+        let found = false;
+        while (low < high) {
+          const mid = low + high >>> 1;
+          const cmp = usePrimary ? this.comparator.primaryAsc(target, values[mid]) : this.comparator.asc(target, values[mid]);
+          if (cmp === 0) {
+            found = true;
+            if (upperBound) low = mid + 1;
+            else high = mid;
+          } else if (cmp < 0) {
+            high = mid;
+          } else {
+            low = mid + 1;
+          }
+        }
+        return { index: low, found };
+      }
     };
     var BPTreeSyncTransaction = class extends BPTreeTransaction {
       constructor(rootTx, mvccRoot, mvcc, strategy, comparator, option) {
@@ -2036,58 +2055,24 @@ var require_cjs = __commonJS({
       insertableNode(value) {
         let node = this.getNode(this.rootId);
         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.isSame(value, nValue)) {
-              node = this.getNode(k[i + 1]);
-              break;
-            } else if (this.comparator.isLower(value, nValue)) {
-              node = this.getNode(k[i]);
-              break;
-            } else if (i + 1 === node.values.length) {
-              node = this.getNode(k[i + 1]);
-              break;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, false, true);
+          node = this.getNode(node.keys[index]);
         }
         return node;
       }
       insertableNodeByPrimary(value) {
         let node = this.getNode(this.rootId);
         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.isPrimarySame(value, nValue)) {
-              node = this.getNode(k[i]);
-              break;
-            } else if (this.comparator.isPrimaryLower(value, nValue)) {
-              node = this.getNode(k[i]);
-              break;
-            } else if (i + 1 === node.values.length) {
-              node = this.getNode(k[i + 1]);
-              break;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, true, false);
+          node = this.getNode(node.keys[index]);
         }
         return node;
       }
       insertableRightestNodeByPrimary(value) {
         let node = this.getNode(this.rootId);
         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;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, true, true);
+          node = this.getNode(node.keys[index]);
         }
         return node;
       }
@@ -2220,12 +2205,11 @@ var require_cjs = __commonJS({
       }
       exists(key, value) {
         const node = this.insertableNode(value);
-        for (let i = 0, len = node.values.length; i < len; i++) {
-          if (this.comparator.isSame(value, node.values[i])) {
-            const keys = node.keys[i];
-            if (keys.includes(key)) {
-              return true;
-            }
+        const { index, found } = this._binarySearchValues(node.values, value);
+        if (found) {
+          const keys = node.keys[index];
+          if (keys.includes(key)) {
+            return true;
           }
         }
         return false;
@@ -2855,58 +2839,24 @@ var require_cjs = __commonJS({
       async insertableNode(value) {
         let node = await this.getNode(this.rootId);
         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.isSame(value, nValue)) {
-              node = await this.getNode(k[i + 1]);
-              break;
-            } else if (this.comparator.isLower(value, nValue)) {
-              node = await this.getNode(k[i]);
-              break;
-            } else if (i + 1 === node.values.length) {
-              node = await this.getNode(k[i + 1]);
-              break;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, false, true);
+          node = await this.getNode(node.keys[index]);
         }
         return node;
       }
       async insertableNodeByPrimary(value) {
         let node = await this.getNode(this.rootId);
         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.isPrimarySame(value, nValue)) {
-              node = await this.getNode(k[i]);
-              break;
-            } else if (this.comparator.isPrimaryLower(value, nValue)) {
-              node = await this.getNode(k[i]);
-              break;
-            } else if (i + 1 === node.values.length) {
-              node = await this.getNode(k[i + 1]);
-              break;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, true, false);
+          node = await this.getNode(node.keys[index]);
         }
         return node;
       }
       async insertableRightestNodeByPrimary(value) {
         let node = await this.getNode(this.rootId);
         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;
-            }
-          }
+          const { index } = this._binarySearchValues(node.values, value, true, true);
+          node = await this.getNode(node.keys[index]);
         }
         return node;
       }
@@ -2959,11 +2909,21 @@ var require_cjs = __commonJS({
         let node = startNode;
         let done = false;
         let hasMatched = false;
+        let nextNodePromise = null;
         while (!done) {
           if (endNode && node.id === endNode.id) {
             done = true;
             break;
           }
+          if (direction === 1) {
+            if (node.next && !done) {
+              nextNodePromise = this.getNode(node.next);
+            }
+          } else {
+            if (node.prev && !done) {
+              nextNodePromise = this.getNode(node.prev);
+            }
+          }
           const len = node.values.length;
           if (direction === 1) {
             for (let i = 0; i < len; i++) {
@@ -2996,19 +2956,15 @@ var require_cjs = __commonJS({
               }
             }
           }
-          if (done) break;
-          if (direction === 1) {
-            if (!node.next) {
-              done = true;
-              break;
-            }
-            node = await this.getNode(node.next);
+          if (done) {
+            if (nextNodePromise) await nextNodePromise;
+            break;
+          }
+          if (nextNodePromise) {
+            node = await nextNodePromise;
+            nextNodePromise = null;
           } else {
-            if (!node.prev) {
-              done = true;
-              break;
-            }
-            node = await this.getNode(node.prev);
+            done = true;
           }
         }
       }
@@ -3039,12 +2995,11 @@ var require_cjs = __commonJS({
       }
       async exists(key, value) {
         const node = await this.insertableNode(value);
-        for (let i = 0, len = node.values.length; i < len; i++) {
-          if (this.comparator.isSame(value, node.values[i])) {
-            const keys = node.keys[i];
-            if (keys.includes(key)) {
-              return true;
-            }
+        const { index, found } = this._binarySearchValues(node.values, value);
+        if (found) {
+          const keys = node.keys[index];
+          if (keys.includes(key)) {
+            return true;
           }
         }
         return false;
@@ -8715,6 +8670,7 @@ var require_cjs = __commonJS({
       }
       /**
        * Selects multiple rows by their PKs in a single B+ Tree traversal.
+       * Results are returned in no guaranteed order, and PKs not found are excluded from the result.
        * @param pks Array of PKs to look up
        * @param tx Transaction
        * @returns Array of raw data of the rows in the same order as input PKs
@@ -8726,17 +8682,58 @@ var require_cjs = __commonJS({
         const minPk = Math.min(...pks);
         const maxPk = Math.max(...pks);
         const pkSet = new Set(pks);
-        const resultMap = /* @__PURE__ */ new Map();
+        const pkRidPairs = [];
         const btx = await this.getBPTreeTransaction(tx);
         const stream = btx.whereStream({ gte: minPk, lte: maxPk });
         for await (const [rid, pk] of stream) {
           if (pkSet.has(pk)) {
-            const rowData = await this.fetchRowByRid(pk, rid, tx);
-            resultMap.set(pk, rowData);
+            pkRidPairs.push({ pk, rid });
           }
         }
+        const resultMap = await this.fetchRowsByRids(pkRidPairs, tx);
         return pks.map((pk) => resultMap.get(pk) ?? null);
       }
+      /**
+       * Fetches multiple rows by their RID and PK combinations, grouping by page ID to minimize I/O.
+       * @param pkRidPairs Array of {pk, rid} pairs
+       * @param tx Transaction
+       * @returns Map of PK to row data
+       */
+      async fetchRowsByRids(pkRidPairs, tx) {
+        const resultMap = /* @__PURE__ */ new Map();
+        if (pkRidPairs.length === 0) return resultMap;
+        const pageGroupMap = /* @__PURE__ */ new Map();
+        for (const pair of pkRidPairs) {
+          const rid = pair.rid;
+          const slotIndex = rid % 65536;
+          const pageId = Math.floor(rid / 65536);
+          if (!pageGroupMap.has(pageId)) {
+            pageGroupMap.set(pageId, []);
+          }
+          pageGroupMap.get(pageId).push({ pk: pair.pk, slotIndex });
+        }
+        const sortedPageEntries = Array.from(pageGroupMap.entries()).sort((a, b) => a[0] - b[0]);
+        await Promise.all(sortedPageEntries.map(async ([pageId, items]) => {
+          const page = await this.pfs.get(pageId, tx);
+          if (!this.factory.isDataPage(page)) {
+            throw new Error(`Page ${pageId} is not a data page`);
+          }
+          const manager = this.factory.getManager(page);
+          for (const item of items) {
+            const row = manager.getRow(page, item.slotIndex);
+            if (this.rowManager.getDeletedFlag(row)) {
+              resultMap.set(item.pk, null);
+            } else if (this.rowManager.getOverflowFlag(row)) {
+              const overflowPageId = bytesToNumber(this.rowManager.getBody(row));
+              const body = await this.pfs.getBody(overflowPageId, true, tx);
+              resultMap.set(item.pk, body);
+            } else {
+              resultMap.set(item.pk, this.rowManager.getBody(row));
+            }
+          }
+        }));
+        return resultMap;
+      }
       async fetchRowByRid(pk, rid, tx) {
         this.keyManager.setBufferFromKey(rid, this.ridBuffer);
         const pageId = this.keyManager.getPageId(this.ridBuffer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "document-dataply",
-  "version": "0.0.4",
+  "version": "0.0.5-alpha.0",
   "description": "Simple and powerful JSON document database supporting complex queries and flexible indexing policies.",
   "license": "MIT",
   "author": "izure <admin@izure.org>",
@@ -42,7 +42,7 @@
     "dataply"
   ],
   "dependencies": {
-    "dataply": "^0.0.20"
+    "dataply": "^0.0.21-alpha.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
@@ -51,4 +51,4 @@
     "ts-jest": "^29.4.6",
     "typescript": "^5.9.3"
   }
-}
+}