@itwin/core-backend 5.1.0-dev.34 → 5.1.0-dev.36

package/lib/cjs/ChangesetECAdaptor.d.ts

@@ -2,7 +2,7 @@
  * @module ECDb
  */
 import { Id64String } from "@itwin/core-bentley";
-import { SqliteChangeOp, SqliteChangesetReader, SqliteValueStage } from "./SqliteChangesetReader";
+import { AnyDb, SqliteChangeOp, SqliteChangesetReader, SqliteValueStage } from "./SqliteChangesetReader";
 /**
  * Record meta data for the change.
  * @beta
@@ -31,33 +31,83 @@ export interface ChangedECInstance {
     $meta?: ChangeMetaData;
     [key: string]: any;
 }
+/**
+ * Represents a cache for unifying EC changes.
+ * @beta
+ */
+export interface ECChangeUnifierCache extends Disposable {
+    /**
+     * Retrieves the value associated with the specified key from the cache.
+     * @param key - The key to retrieve the value for.
+     * @returns The value associated with the key, or undefined if the key is not found.
+     */
+    get(key: string): ChangedECInstance | undefined;
+    /**
+     * Sets the value associated with the specified key in the cache.
+     * @param key - The key to set the value for.
+     * @param value - The value to be associated with the key.
+     */
+    set(key: string, value: ChangedECInstance): void;
+    /**
+     * Returns an iterator for all the values in the cache.
+     * @returns An iterator for all the values in the cache.
+     */
+    all(): IterableIterator<ChangedECInstance>;
+    /**
+     * Returns the number of entries in the cache.
+     * @returns The number of entries in the cache.
+     */
+    count(): number;
+}
+export declare namespace ECChangeUnifierCache {
+    function createInMemory(): ECChangeUnifierCache;
+    function createSqliteBacked(db: AnyDb, bufferedReadInstanceSizeInBytes?: number): ECChangeUnifierCache;
+}
 /**
  * Combine partial changed instance into single instance.
  * Partial changes is per table and a single instance can
  * span multiple tables.
  * @beta
  */
-export declare class PartialECChangeUnifier {
+export declare class PartialECChangeUnifier implements Disposable {
+    private _db;
     private _cache;
     private _readonly;
+    constructor(_db: AnyDb, _cache?: ECChangeUnifierCache);
+    /**
+     * Dispose the instance.
+     */
+    [Symbol.dispose](): void;
     /**
      * Get root class id for a given class
      * @param classId given class id
      * @param db use to find root class
      * @returns return root class id
      */
-    private static getRootClassId;
+    private getRootClassId;
+    /**
+     * Checks if the given `rhsClassId` is an instance of the `lhsClassId`.
+     * @param rhsClassId The ID of the right-hand side class.
+     * @param lhsClassId The ID of the left-hand side class.
+     * @returns `true` if `rhsClassId` is an instance of `lhsClassId`, `false` otherwise.
+     */
+    private instanceOf;
     /**
      * Combine partial instance with instance with same key if already exists.
      * @param rhs partial instance
      */
     private combine;
+    /**
+     * Returns the number of instances in the cache.
+     * @returns The number of instances in the cache.
+     */
+    getInstanceCount(): number;
     /**
      * Build key from EC change.
      * @param change EC change
      * @returns key created from EC change.
      */
-    private static buildKey;
+    private buildKey;
     /**
      * Append partial changes which will be combine using there instance key.
      * @note $meta property must be present on partial change as information
@@ -66,10 +116,6 @@ export declare class PartialECChangeUnifier {
      * @beta
      */
     appendFrom(adaptor: ChangesetECAdaptor): void;
-    /**
-     * Delete $meta from all the instances.
-     */
-    stripMetaData(): void;
     /**
      * Returns complete EC change instances.
      * @beta

package/lib/cjs/ChangesetECAdaptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ChangesetECAdaptor.d.ts","sourceRoot":"","sources":["../../src/ChangesetECAdaptor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChangesetECAdaptor.d.ts","sourceRoot":"","sources":["../../src/ChangesetECAdaptor.ts"],"names":[],"mappings":"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"}

package/lib/cjs/ChangesetECAdaptor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangesetECAdaptor = exports.PartialECChangeUnifier = void 0;
+exports.ChangesetECAdaptor = exports.PartialECChangeUnifier = exports.ECChangeUnifierCache = void 0;
 /*---------------------------------------------------------------------------------------------
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
@@ -9,6 +9,9 @@ exports.ChangesetECAdaptor = exports.PartialECChangeUnifier = void 0;
  * @module ECDb
  */
 const core_bentley_1 = require("@itwin/core-bentley");
+const core_common_1 = require("@itwin/core-common");
+const ECDb_1 = require("./ECDb");
+const Symbols_1 = require("./internal/Symbols");
 class ECDbMap {
     db;
     _cachedClassMaps = new Map();
@@ -321,6 +324,186 @@ var DateTime;
     }
     DateTime.fromJulianDay = fromJulianDay;
 })(DateTime || (DateTime = {}));
+var ECChangeUnifierCache;
+(function (ECChangeUnifierCache) {
+    function createInMemory() {
+        return new InMemoryInstanceCache();
+    }
+    ECChangeUnifierCache.createInMemory = createInMemory;
+    function createSqliteBacked(db, bufferedReadInstanceSizeInBytes = 1024 * 1024 * 10) {
+        return new SqliteBackedInstanceCache(db, bufferedReadInstanceSizeInBytes);
+    }
+    ECChangeUnifierCache.createSqliteBacked = createSqliteBacked;
+})(ECChangeUnifierCache || (exports.ECChangeUnifierCache = ECChangeUnifierCache = {}));
+/**
+ * In-memory cache for storing changed EC instances.
+ */
+class InMemoryInstanceCache {
+    _cache = new Map();
+    /**
+     * Retrieves the changed EC instance associated with the specified key.
+     * @param key - The key used to retrieve the instance.
+     * @returns The changed EC instance, or undefined if not found.
+     */
+    get(key) {
+        return this._cache.get(key);
+    }
+    /**
+     * Sets the changed EC instance associated with the specified key.
+     * @param key - The key used to store the instance.
+     * @param value - The changed EC instance to be stored.
+     */
+    set(key, value) {
+        const meta = value.$meta;
+        // Remove undefined keys
+        if (meta) {
+            Object.keys(meta).forEach((k) => meta[k] === undefined && delete meta[k]);
+        }
+        this._cache.set(key, value);
+    }
+    /**
+     * Returns an iterator over all the changed EC instances in the cache.
+     * @returns An iterator over all the changed EC instances.
+     */
+    *all() {
+        for (const key of Array.from(this._cache.keys()).sort()) {
+            const instance = this._cache.get(key);
+            if (instance) {
+                yield instance;
+            }
+        }
+    }
+    /**
+     * Returns the number of changed EC instances in the cache.
+     * @returns The number of changed EC instances.
+     */
+    count() {
+        return this._cache.size;
+    }
+    /**
+     * Disposes the cache.
+     */
+    [Symbol.dispose]() {
+        // Implementation details
+    }
+}
+/**
+ * Represents a cache for unifying EC changes in a SQLite-backed instance cache.
+ */
+class SqliteBackedInstanceCache {
+    _db;
+    bufferedReadInstanceSizeInBytes;
+    _cacheTable = `[temp].[${core_bentley_1.Guid.createValue()}]`;
+    static defaultBufferSize = 1024 * 1024 * 10; // 10MB
+    /**
+     * Creates an instance of SqliteBackedInstanceCache.
+     * @param _db The underlying database connection.
+     * @param bufferedReadInstanceSizeInBytes The size of read instance buffer defaults to 10Mb.
+     * @throws Error if bufferedReadInstanceSizeInBytes is less than or equal to 0.
+     */
+    constructor(_db, bufferedReadInstanceSizeInBytes = SqliteBackedInstanceCache.defaultBufferSize) {
+        this._db = _db;
+        this.bufferedReadInstanceSizeInBytes = bufferedReadInstanceSizeInBytes;
+        if (bufferedReadInstanceSizeInBytes <= 0)
+            throw new Error("bufferedReadInstanceCount must be greater than 0");
+        this.createTempTable();
+    }
+    /**
+     * Creates a temporary table in the database for caching instances.
+     * @throws Error if unable to create the temporary table.
+     */
+    createTempTable() {
+        this._db.withSqliteStatement(`CREATE TABLE ${this._cacheTable} ([key] text primary key, [value] text)`, (stmt) => {
+            if (core_bentley_1.DbResult.BE_SQLITE_DONE !== stmt.step())
+                throw new Error("unable to create temp table");
+        });
+    }
+    /**
+     * Drops the temporary table from the database.
+     * @throws Error if unable to drop the temporary table.
+     */
+    dropTempTable() {
+        this._db.saveChanges();
+        if (this._db instanceof ECDb_1.ECDb)
+            this._db.clearStatementCache();
+        else {
+            this._db.clearCaches();
+            this._db[Symbols_1._nativeDb].clearECDbCache();
+        }
+        this._db.withSqliteStatement(`DROP TABLE IF EXISTS ${this._cacheTable}`, (stmt) => {
+            if (core_bentley_1.DbResult.BE_SQLITE_DONE !== stmt.step())
+                throw new Error("unable to drop temp table");
+        });
+    }
+    /**
+     * Retrieves the changed EC instance from the cache based on the specified key.
+     * @param key The key of the instance.
+     * @returns The changed EC instance if found, otherwise undefined.
+     */
+    get(key) {
+        return this._db.withPreparedSqliteStatement(`SELECT [value] FROM ${this._cacheTable} WHERE [key]=?`, (stmt) => {
+            stmt.bindString(1, key);
+            if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW) {
+                const out = JSON.parse(stmt.getValueString(0), core_common_1.Base64EncodedString.reviver);
+                return out;
+            }
+            return undefined;
+        });
+    }
+    /**
+     * Sets the changed EC instance in the cache with the specified key.
+     * @param key The key of the instance.
+     * @param value The changed EC instance to be set.
+     */
+    set(key, value) {
+        const shallowCopy = Object.assign({}, value);
+        this._db.withPreparedSqliteStatement(`INSERT INTO ${this._cacheTable} ([key], [value]) VALUES (?, ?) ON CONFLICT ([key]) DO UPDATE SET [value] = [excluded].[value]`, (stmt) => {
+            stmt.bindString(1, key);
+            stmt.bindString(2, JSON.stringify(shallowCopy, core_common_1.Base64EncodedString.replacer));
+            stmt.step();
+        });
+    }
+    /**
+     * Returns an iterator for all the changed EC instances in the cache.
+     * @returns An iterator for all the changed EC instances.
+     */
+    *all() {
+        const sql = `
+      SELECT JSON_GROUP_ARRAY (JSON([value]))
+      FROM   (SELECT
+                    [value],
+                    SUM (LENGTH ([value])) OVER (ORDER BY [key] ROWS UNBOUNDED PRECEDING) / ${this.bufferedReadInstanceSizeInBytes} AS [bucket]
+              FROM   ${this._cacheTable})
+      GROUP  BY [bucket]`;
+        const stmt = this._db.prepareSqliteStatement(sql);
+        while (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW) {
+            const instanceBucket = JSON.parse(stmt.getValueString(0), core_common_1.Base64EncodedString.reviver);
+            for (const value of instanceBucket) {
+                yield value;
+            }
+        }
+        stmt[Symbol.dispose]();
+    }
+    /**
+     * Returns the number of instances in the cache.
+     * @returns The number of instances in the cache.
+     */
+    count() {
+        return this._db.withPreparedSqliteStatement(`SELECT COUNT(*) FROM ${this._cacheTable}`, (stmt) => {
+            if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW)
+                return stmt.getValue(0).getInteger();
+            return 0;
+        });
+    }
+    /**
+     * Disposes the cache by dropping the temporary table.
+     */
+    [Symbol.dispose]() {
+        if (this._db.isOpen) {
+            this.dropTempTable();
+        }
+    }
+}
 /**
  * Combine partial changed instance into single instance.
  * Partial changes is per table and a single instance can
@@ -328,15 +511,26 @@ var DateTime;
  * @beta
  */
 class PartialECChangeUnifier {
-    _cache = new Map();
+    _db;
+    _cache;
     _readonly = false;
+    constructor(_db, _cache = new InMemoryInstanceCache()) {
+        this._db = _db;
+        this._cache = _cache;
+    }
+    /**
+     * Dispose the instance.
+     */
+    [Symbol.dispose]() {
+        this._cache[Symbol.dispose]();
+    }
     /**
      * Get root class id for a given class
      * @param classId given class id
      * @param db use to find root class
      * @returns return root class id
      */
-    static getRootClassId(classId, db) {
+    getRootClassId(classId) {
         const sql = `
       WITH
       [base_class]([classId], [baseClassId], [Level]) AS(
@@ -359,7 +553,7 @@ class PartialECChangeUnifier {
                     WHERE  [cc].[Name] = 'IsMixIn'
                             AND [ss].[Name] = 'CoreCustomAttributes'))
       ORDER BY [Level] DESC`;
-        return db.withSqliteStatement(sql, (stmt) => {
+        return this._db.withSqliteStatement(sql, (stmt) => {
             stmt.bindId(1, classId);
             if (stmt.step() === core_bentley_1.DbResult.BE_SQLITE_ROW && !stmt.isValueNull(0)) {
                 return stmt.getValueString(0);
@@ -367,15 +561,30 @@ class PartialECChangeUnifier {
             return classId;
         });
     }
+    /**
+     * Checks if the given `rhsClassId` is an instance of the `lhsClassId`.
+     * @param rhsClassId The ID of the right-hand side class.
+     * @param lhsClassId The ID of the left-hand side class.
+     * @returns `true` if `rhsClassId` is an instance of `lhsClassId`, `false` otherwise.
+     */
+    instanceOf(rhsClassId, lhsClassId) {
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        return this._db.withPreparedStatement("SELECT ec_instanceof(?,?)", (stmt) => {
+            stmt.bindId(1, rhsClassId);
+            stmt.bindId(2, lhsClassId);
+            stmt.step();
+            return stmt.getValue(0).getInteger() === 1;
+        });
+    }
     /**
      * Combine partial instance with instance with same key if already exists.
      * @param rhs partial instance
      */
-    combine(rhs, db) {
+    combine(rhs) {
         if (!rhs.$meta) {
             throw new Error("PartialECChange being combine must have '$meta' property");
         }
-        const key = PartialECChangeUnifier.buildKey(rhs, db);
+        const key = this.buildKey(rhs);
         const lhs = this._cache.get(key);
         if (lhs) {
             const { $meta: _, ...restOfRhs } = rhs;
@@ -384,37 +593,39 @@ class PartialECChangeUnifier {
                 lhs.$meta.tables = [...rhs.$meta?.tables, ...lhs.$meta?.tables];
                 lhs.$meta.changeIndexes = [...rhs.$meta?.changeIndexes, ...lhs.$meta?.changeIndexes];
                 // we preserve child class name & id when merging instance.
-                if (rhs.$meta.fallbackClassId && lhs.$meta.fallbackClassId && db && rhs.$meta.fallbackClassId !== lhs.$meta.fallbackClassId) {
+                if (rhs.$meta.fallbackClassId && lhs.$meta.fallbackClassId && rhs.$meta.fallbackClassId !== lhs.$meta.fallbackClassId) {
                     const lhsClassId = lhs.$meta.fallbackClassId;
                     const rhsClassId = rhs.$meta.fallbackClassId;
-                    // eslint-disable-next-line @typescript-eslint/no-deprecated
-                    const isRhsIsSubClassOfLhs = db.withPreparedStatement("SELECT ec_instanceof(?,?)", (stmt) => {
-                        stmt.bindId(1, rhsClassId);
-                        stmt.bindId(2, lhsClassId);
-                        stmt.step();
-                        return stmt.getValue(0).getInteger() === 1;
-                    });
+                    const isRhsIsSubClassOfLhs = this.instanceOf(rhsClassId, lhsClassId);
                     if (isRhsIsSubClassOfLhs) {
                         lhs.$meta.fallbackClassId = rhs.$meta.fallbackClassId;
                         lhs.$meta.classFullName = rhs.$meta.classFullName;
                     }
                 }
             }
+            this._cache.set(key, lhs);
         }
         else {
             this._cache.set(key, rhs);
         }
     }
+    /**
+     * Returns the number of instances in the cache.
+     * @returns The number of instances in the cache.
+     */
+    getInstanceCount() {
+        return this._cache.count();
+    }
     /**
      * Build key from EC change.
      * @param change EC change
      * @returns key created from EC change.
      */
-    static buildKey(change, db) {
+    buildKey(change) {
         let classId = change.ECClassId;
         if (typeof classId === "undefined") {
-            if (db && change.$meta?.fallbackClassId) {
-                classId = this.getRootClassId(change.$meta.fallbackClassId, db);
+            if (change.$meta?.fallbackClassId) {
+                classId = this.getRootClassId(change.$meta.fallbackClassId);
             }
             if (typeof classId === "undefined") {
                 throw new Error(`unable to resolve ECClassId to root class id.`);
@@ -437,32 +648,23 @@ class PartialECChangeUnifier {
             throw new Error("this instance is marked as readonly.");
         }
         if (adaptor.op === "Updated" && adaptor.inserted && adaptor.deleted) {
-            this.combine(adaptor.inserted, adaptor.reader.db);
-            this.combine(adaptor.deleted, adaptor.reader.db);
+            this.combine(adaptor.inserted);
+            this.combine(adaptor.deleted);
         }
         else if (adaptor.op === "Inserted" && adaptor.inserted) {
-            this.combine(adaptor.inserted, adaptor.reader.db);
+            this.combine(adaptor.inserted);
         }
         else if (adaptor.op === "Deleted" && adaptor.deleted) {
-            this.combine(adaptor.deleted, adaptor.reader.db);
-        }
-    }
-    /**
-     * Delete $meta from all the instances.
-     */
-    stripMetaData() {
-        for (const inst of this._cache.values()) {
-            if ("$meta" in inst) {
-                delete inst.$meta;
-            }
+            this.combine(adaptor.deleted);
         }
-        this._readonly = true;
     }
     /**
      * Returns complete EC change instances.
      * @beta
      */
-    get instances() { return this._cache.values(); }
+    get instances() {
+        return this._cache.all();
+    }
 }
 exports.PartialECChangeUnifier = PartialECChangeUnifier;
 /**