@harperfast/harper 5.0.1 → 5.0.3

package/dist/resources/RocksIndexStore.js

@@ -3,12 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RocksIndexStore = void 0;
 const rocksdb_js_1 = require("@harperfast/rocksdb-js");
 const ordered_binary_1 = require("ordered-binary");
-class RocksIndexStore extends rocksdb_js_1.Store {
+/**
+ * A specialized RocksDB-based index store that maintains indexed references to primary keys.
+ * This store uses composite keys consisting of indexed values and primary keys, enabling
+ * efficient range queries over indexed data. The actual data values are stored as null since
+ * this is purely an index structure pointing to primary records elsewhere. This extends
+ * RocksDatabase rather than a store because it actually alters the interface
+ */
+class RocksIndexStore extends rocksdb_js_1.RocksDatabase {
     /**
      * Get all entries matching the range
      * @param options
      */
-    getRange(context, options) {
+    getRange(options) {
         let { start, end, exclusiveStart, inclusiveEnd, reverse } = options;
         if ((reverse ? !exclusiveStart : exclusiveStart) && start !== undefined) {
             start = [start, ordered_binary_1.MAXIMUM_KEY];
@@ -17,7 +24,7 @@ class RocksIndexStore extends rocksdb_js_1.Store {
             end = [end, ordered_binary_1.MAXIMUM_KEY];
         }
         const translatedOptions = { ...options, start, end };
-        return super.getRange(context, translatedOptions).map(({ key }) => {
+        return super.getRange(translatedOptions).map(({ key }) => {
             return { key: key[0], value: key.length > 2 ? key.slice(1) : key[1] };
         });
     }
@@ -27,17 +34,17 @@ class RocksIndexStore extends rocksdb_js_1.Store {
      * @param primaryKey
      * @param txnId
      */
-    put(context, indexedValue, primaryKey, options) {
-        return super.putSync(context, [indexedValue, primaryKey], null, options);
+    put(indexedValue, primaryKey, options) {
+        return super.putSync([indexedValue, primaryKey], null, options);
     }
-    putSync(context, indexedValue, primaryKey, options) {
-        return super.putSync(context, [indexedValue, primaryKey], null, options);
+    putSync(indexedValue, primaryKey, options) {
+        return super.putSync([indexedValue, primaryKey], null, options);
     }
-    remove(context, indexedValue, primaryKey, options) {
-        return super.removeSync(context, [indexedValue, primaryKey], options);
+    remove(indexedValue, primaryKey, options) {
+        return super.removeSync([indexedValue, primaryKey], options);
     }
-    removeSync(context, indexedValue, primaryKey, options) {
-        super.removeSync(context, [indexedValue, primaryKey], options);
+    removeSync(indexedValue, primaryKey, options) {
+        super.removeSync([indexedValue, primaryKey], options);
     }
 }
 exports.RocksIndexStore = RocksIndexStore;
@@ -46,7 +53,7 @@ exports.RocksIndexStore = RocksIndexStore;
  * classes.
  */
 rocksdb_js_1.DBI.prototype.getValuesCount = function getValuesCount(indexedValue) {
-    if (this.store instanceof RocksIndexStore) {
+    if (this instanceof RocksIndexStore) {
         return this.store.getCount(this._context, { start: indexedValue, end: [indexedValue, ordered_binary_1.MAXIMUM_KEY] });
     }
     throw new Error('getValuesCount is only supported if dupSort=true');

package/dist/resources/RocksIndexStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"RocksIndexStore.js","sourceRoot":"","sources":["../../resources/RocksIndexStore.ts"],"names":[],"mappings":";;;AAAA,uDAOgC;AAEhC,mDAA6C;AAS7C,MAAa,eAAgB,SAAQ,kBAAK;IACzC;;;OAGG;IACH,QAAQ,CAAC,OAAqB,EAAE,OAA6B;QAC5D,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzE,KAAK,GAAG,CAAC,KAAK,EAAE,4BAAW,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACnE,GAAG,GAAG,CAAC,GAAG,EAAE,4BAAW,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,iBAAiB,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;YACjE,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,OAAqB,EAAE,YAAiB,EAAE,UAAc,EAAE,OAAwB;QACrF,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,CAAC,OAAqB,EAAE,YAAiB,EAAE,UAAc,EAAE,OAAwB;QACzF,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,OAAqB,EAAE,YAAiB,EAAE,UAAc,EAAE,OAA4B;QAC5F,OAAO,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,UAAU,CAAC,OAAqB,EAAE,YAAiB,EAAE,UAAc,EAAE,OAA4B;QAChG,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;CACD;AAxCD,0CAwCC;AAED;;;GAGG;AACH,gBAAG,CAAC,SAAS,CAAC,cAAc,GAAG,SAAS,cAAc,CAAC,YAAiB;IACvE,IAAI,IAAI,CAAC,KAAK,YAAY,eAAe,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,4BAAW,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACrE,CAAC,CAAC"}
+{"version":3,"file":"RocksIndexStore.js","sourceRoot":"","sources":["../../resources/RocksIndexStore.ts"],"names":[],"mappings":";;;AAAA,uDAMgC;AAEhC,mDAA6C;AAQ7C;;;;;;GAMG;AACH,MAAa,eAAgB,SAAQ,0BAAa;IACjD;;;OAGG;IACH,QAAQ,CAAC,OAA6B;QACrC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACpE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzE,KAAK,GAAG,CAAC,KAAK,EAAE,4BAAW,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACnE,GAAG,GAAG,CAAC,GAAG,EAAE,4BAAW,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,iBAAiB,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;YACxD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,CAAC,CAAC,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,YAAiB,EAAE,UAAc,EAAE,OAAwB;QAC9D,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,OAAO,CAAC,YAAiB,EAAE,UAAc,EAAE,OAAwB;QAClE,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,YAAiB,EAAE,UAAc,EAAE,OAA4B;QACrE,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,UAAU,CAAC,YAAiB,EAAE,UAAc,EAAE,OAA4B;QACzE,KAAK,CAAC,UAAU,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;CACD;AAxCD,0CAwCC;AAED;;;GAGG;AACH,gBAAG,CAAC,SAAS,CAAC,cAAc,GAAG,SAAS,cAAc,CAAC,YAAiB;IACvE,IAAI,IAAI,YAAY,eAAe,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,4BAAW,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;AACrE,CAAC,CAAC"}

package/dist/resources/Table.js

@@ -1320,27 +1320,41 @@ function makeTable(options) {
          */
         static evict(id, existingRecord, existingVersion) {
             let entry;
-            if (hasSourceGet || audit) {
-                if (!existingRecord)
-                    return;
-                entry = primaryStore.getEntry(id);
-                if (!entry || !existingRecord)
-                    return;
-                if (entry.version !== existingVersion)
-                    return;
+            let transaction = txnForContext({ transaction: new DatabaseTransaction_ts_1.DatabaseTransaction() }).getReadTxn();
+            let options = { transaction };
+            try {
+                if (hasSourceGet || audit) {
+                    if (!existingRecord)
+                        return;
+                    entry = primaryStore.getEntry(id, options);
+                    if (!entry || !existingRecord)
+                        return;
+                    if (entry.version !== existingVersion)
+                        return;
+                }
+                if (hasSourceGet) {
+                    // if there is a resolution in-progress, abandon the eviction
+                    if (primaryStore.hasLock(id, entry.version))
+                        return;
+                }
+                // evictions never go in the audit log, so we can not record a deletion entry for the eviction
+                // as there is no corresponding audit entry and it would never get cleaned up. So we must simply
+                // removed the entry entirely, but first cleanup indices
+                if (primaryStore.ifVersion) {
+                    // lmdb
+                    primaryStore.ifVersion?.(id, existingVersion, () => {
+                        updateIndices(id, existingRecord, null);
+                    });
+                    return (0, RecordEncoder_ts_1.removeEntry)(primaryStore, entry ?? primaryStore.getEntry(id), existingVersion);
+                }
+                else {
+                    updateIndices(id, existingRecord, null, options);
+                    return (0, RecordEncoder_ts_1.removeEntry)(primaryStore, entry ?? primaryStore.getEntry(id), options);
+                }
             }
-            if (hasSourceGet) {
-                // if there is a resolution in-progress, abandon the eviction
-                if (primaryStore.hasLock(id, entry.version))
-                    return;
+            finally {
+                return transaction.commit();
             }
-            primaryStore.ifVersion?.(id, existingVersion, () => {
-                updateIndices(id, existingRecord, null);
-            });
-            // evictions never go in the audit log, so we can not record a deletion entry for the eviction
-            // as there is no corresponding audit entry and it would never get cleaned up. So we must simply
-            // removed the entry entirely
-            return (0, RecordEncoder_ts_1.removeEntry)(primaryStore, entry ?? primaryStore.getEntry(id), existingVersion);
         }
         /**
          * This is intended to acquire a lock on a record from the whole cluster.
@@ -1798,10 +1812,10 @@ function makeTable(options) {
                             context.lastModified = existingEntry.version;
                         TableResource._updateResource(this, existingEntry);
                     }
-                    if (precedesExistingVersion(txnTime, existingEntry, options?.nodeId) <= 0)
-                        return; // a newer record exists locally
-                    updateIndices(id, existingRecord);
-                    logger_ts_1.logger.trace?.(`Deleting record with id: ${id}, txn timestamp: ${new Date(txnTime).toISOString()}`);
+                    if (precedesExistingVersion(txnTime, existingEntry, options?.nodeId) < 0) {
+                        return;
+                    } // a newer record exists locally
+                    updateIndices(id, existingRecord, null, transaction && { transaction });
                     if (audit || trackDeletes) {
                         updateRecord(id, null, existingEntry, txnTime, 0, audit, {
                             user: context?.user,
@@ -2071,7 +2085,9 @@ function makeTable(options) {
                         return (entryA, entryB) => {
                             const a = getAttributeValue(entryA, order.attribute, context);
                             const b = getAttributeValue(entryB, order.attribute, context);
-                            const diff = descending ? (0, ordered_binary_1.compareKeys)(b, a) : (0, ordered_binary_1.compareKeys)(a, b);
+                            const diff = descending
+                                ? (0, ordered_binary_1.compareKeys)(convertToComparableKeys(b), convertToComparableKeys(a))
+                                : (0, ordered_binary_1.compareKeys)(convertToComparableKeys(a), convertToComparableKeys(b));
                             if (diff === 0)
                                 return nextComparator?.(entryA, entryB) || 0;
                             return diff;
@@ -3309,6 +3325,7 @@ function makeTable(options) {
             // determine what index values need to be removed and added
             let valuesToAdd = (0, commonUtility_js_1.getIndexedValues)(value, indexNulls);
             let valuesToRemove = (0, commonUtility_js_1.getIndexedValues)(existingValue, indexNulls);
+            let isLMDB = !!index.prefetch;
             if (valuesToRemove?.length > 0) {
                 // put this in a conditional so we can do a faster version for new records
                 // determine the changes/diff from new values and old values
@@ -3326,19 +3343,19 @@ function makeTable(options) {
                     })
                     : [];
                 valuesToRemove = Array.from(setToRemove);
-                if ((valuesToRemove.length > 0 || valuesToAdd.length > 0) && LMDB_PREFETCH_WRITES) {
+                if (isLMDB && (valuesToRemove.length > 0 || valuesToAdd.length > 0) && LMDB_PREFETCH_WRITES) {
                     // prefetch any values that have been removed or added
                     const valuesToPrefetch = valuesToRemove.concat(valuesToAdd).map((v) => ({ key: v, value: id }));
-                    index.prefetch?.(valuesToPrefetch, noop);
+                    index.prefetch(valuesToPrefetch, noop);
                 }
                 //if the update cleared out the attribute value we need to delete it from the index
                 for (let i = 0, l = valuesToRemove.length; i < l; i++) {
                     index.remove(valuesToRemove[i], id, options);
                 }
             }
-            else if (valuesToAdd?.length > 0 && LMDB_PREFETCH_WRITES) {
+            else if (isLMDB && valuesToAdd?.length > 0 && LMDB_PREFETCH_WRITES) {
                 // no old values, just new
-                index.prefetch?.(valuesToAdd.map((v) => ({ key: v, value: id })), noop);
+                index.prefetch(valuesToAdd.map((v) => ({ key: v, value: id })), noop);
             }
             if (valuesToAdd) {
                 for (let i = 0, l = valuesToAdd.length; i < l; i++) {
@@ -3947,7 +3964,7 @@ function makeTable(options) {
                             // don't do anything if the version has changed
                             return;
                         }
-                        updateIndices(id, existingRecord, updatedRecord);
+                        updateIndices(id, existingRecord, updatedRecord, transaction && { transaction });
                         if (updatedRecord) {
                             if (existingEntry) {
                                 context.previousResidency = TableResource.getResidencyRecord(existingEntry.residencyId);
@@ -4386,4 +4403,13 @@ function hasOtherProcesses(store) {
         return +line.match(/\d+/)?.[0] != pid;
     });
 }
+function convertToComparableKeys(a) {
+    if (a instanceof Date) {
+        return a.getTime();
+    }
+    if (Array.isArray(a)) {
+        return a.map(convertToComparableKeys);
+    }
+    return a;
+}
 //# sourceMappingURL=Table.js.map