@itwin/core-backend 5.15.0-dev.14 → 5.15.0-dev.15

package/lib/cjs/internal/QueryMetadataCache.d.ts

@@ -0,0 +1,44 @@
+/** @packageDocumentation
+ * @module ECDb
+ */
+import { DbQueryRequest, DbQueryResponse } from "@itwin/core-common";
+/**
+ * Caches the column metadata returned by concurrent query requests so that new [ECSqlReader]($common) instances for an
+ * already-seen ECSQL can skip asking native to build and marshal it again.
+ *
+ * Column metadata only depends on the prepared statement (i.e. the schema) and the options that influence property naming.
+ * The owning database clears it only in a full `clearCaches()`, together with its statement cache, so it stays exactly as
+ * fresh as the metadata [ECSqlStatement]($backend) caches for `withPreparedStatement` and `withQueryReader`. Every path that
+ * changes the schema must therefore do a full `clearCaches()`. Undo and redo never need to, because saving a schema txn
+ * starts a new undo session, so undo/redo cannot cross a schema change.
+ * A schema change made by another process to a file opened without change watching is not detected; the statement
+ * cache has the same limitation.
+ * @internal
+ */
+export declare class QueryMetadataCache {
+    private readonly _capacity;
+    static readonly defaultCapacity = 200;
+    private readonly _entries;
+    private _generation;
+    constructor(_capacity?: number);
+    /** Number of cached entries. */
+    get size(): number;
+    /** Drop all cached metadata. Requests already in flight will not populate the cache. */
+    clear(): void;
+    private static makeKey;
+    private static copy;
+    private get;
+    private set;
+    /**
+     * The cached counterpart of `executeQueryRequest`, serving column metadata from the cache when possible.
+     * On a cache hit, `executeQueryRequest` is called with `includeMetaData: false` and the cached metadata is attached to the response.
+     * On a miss, `executeQueryRequest` is called with the request unchanged and the returned metadata is cached.
+     * @param request The request to execute. It is not modified.
+     * @param executeQueryRequest Sends a request to native without consulting this cache, typically
+     * `ConcurrentQuery.executeQueryRequest` with the database already bound. Called once, or twice if the cache is cleared
+     * while a successful cache hit is in flight. The second call has no `restartToken`.
+     */
+    executeCachedQueryRequest(request: DbQueryRequest, executeQueryRequest: (request: DbQueryRequest) => Promise<DbQueryResponse>): Promise<DbQueryResponse>;
+    private static hasResult;
+}
+//# sourceMappingURL=QueryMetadataCache.d.ts.map

package/lib/cjs/internal/QueryMetadataCache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryMetadataCache.d.ts","sourceRoot":"","sources":["../../../src/internal/QueryMetadataCache.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,eAAe,EAA2C,MAAM,oBAAoB,CAAC;AAE9G;;;;;;;;;;;;GAYG;AACH,qBAAa,kBAAkB;IAKV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ7C,gBAAuB,eAAe,OAAO;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,WAAW,CAAK;gBAEY,SAAS,SAAqC;IAElF,gCAAgC;IAChC,IAAW,IAAI,IAAI,MAAM,CAA+B;IAExD,wFAAwF;IACjF,KAAK,IAAI,IAAI;IAKpB,OAAO,CAAC,MAAM,CAAC,OAAO;IAKtB,OAAO,CAAC,MAAM,CAAC,IAAI;IAInB,OAAO,CAAC,GAAG;IAUX,OAAO,CAAC,GAAG;IASX;;;;;;;;OAQG;IACU,yBAAyB,CAAC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC;IAkCrK,OAAO,CAAC,MAAM,CAAC,SAAS;CAGzB"}

package/lib/cjs/internal/QueryMetadataCache.js

@@ -0,0 +1,107 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module ECDb
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryMetadataCache = void 0;
+const core_common_1 = require("@itwin/core-common");
+/**
+ * Caches the column metadata returned by concurrent query requests so that new [ECSqlReader]($common) instances for an
+ * already-seen ECSQL can skip asking native to build and marshal it again.
+ *
+ * Column metadata only depends on the prepared statement (i.e. the schema) and the options that influence property naming.
+ * The owning database clears it only in a full `clearCaches()`, together with its statement cache, so it stays exactly as
+ * fresh as the metadata [ECSqlStatement]($backend) caches for `withPreparedStatement` and `withQueryReader`. Every path that
+ * changes the schema must therefore do a full `clearCaches()`. Undo and redo never need to, because saving a schema txn
+ * starts a new undo session, so undo/redo cannot cross a schema change.
+ * A schema change made by another process to a file opened without change watching is not detected; the statement
+ * cache has the same limitation.
+ * @internal
+ */
+class QueryMetadataCache {
+    _capacity;
+    static defaultCapacity = 200;
+    _entries = new Map();
+    _generation = 0;
+    constructor(_capacity = QueryMetadataCache.defaultCapacity) {
+        this._capacity = _capacity;
+    }
+    /** Number of cached entries. */
+    get size() { return this._entries.size; }
+    /** Drop all cached metadata. Requests already in flight will not populate the cache. */
+    clear() {
+        this._entries.clear();
+        ++this._generation;
+    }
+    static makeKey(request) {
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        return `${request.usePrimaryConn ? 1 : 0}|${request.valueFormat ?? 0}|${request.abbreviateBlobs ? 1 : 0}|${request.convertClassIdsToClassNames ? 1 : 0}|${request.query}`;
+    }
+    static copy(properties) {
+        return properties.map((property) => ({ ...property }));
+    }
+    get(key) {
+        const properties = this._entries.get(key);
+        if (properties && this._entries.size > 1) {
+            // Move to the most-recently-used position.
+            this._entries.delete(key);
+            this._entries.set(key, properties);
+        }
+        return properties;
+    }
+    set(key, properties) {
+        this._entries.delete(key);
+        this._entries.set(key, properties);
+        while (this._entries.size > this._capacity) {
+            const oldest = this._entries.keys().next().value;
+            this._entries.delete(oldest);
+        }
+    }
+    /**
+     * The cached counterpart of `executeQueryRequest`, serving column metadata from the cache when possible.
+     * On a cache hit, `executeQueryRequest` is called with `includeMetaData: false` and the cached metadata is attached to the response.
+     * On a miss, `executeQueryRequest` is called with the request unchanged and the returned metadata is cached.
+     * @param request The request to execute. It is not modified.
+     * @param executeQueryRequest Sends a request to native without consulting this cache, typically
+     * `ConcurrentQuery.executeQueryRequest` with the database already bound. Called once, or twice if the cache is cleared
+     * while a successful cache hit is in flight. The second call has no `restartToken`.
+     */
+    async executeCachedQueryRequest(request, executeQueryRequest) {
+        if (!request.includeMetaData)
+            return executeQueryRequest(request);
+        const key = QueryMetadataCache.makeKey(request);
+        const cached = this.get(key);
+        let missRequest = request;
+        if (cached) {
+            const hitGeneration = this._generation;
+            const hitResponse = await executeQueryRequest({ ...request, includeMetaData: false });
+            // Cancelled, failed or busy: there are no rows to describe, so hand the status back to the caller as is.
+            if (!QueryMetadataCache.hasResult(hitResponse))
+                return hitResponse;
+            if (hitGeneration === this._generation) {
+                if (hitResponse.meta === undefined || hitResponse.meta.length === 0)
+                    hitResponse.meta = QueryMetadataCache.copy(cached);
+                return hitResponse;
+            }
+            // Invalidated while in flight: the cached metadata may not match the statement that produced the rows, so run
+            // the request again with metadata. Drop the restart token: a newer request may already be using it, and
+            // resubmitting with it would cancel that request.
+            missRequest = { ...request };
+            delete missRequest.restartToken;
+        }
+        const generation = this._generation;
+        const response = await executeQueryRequest(missRequest);
+        if (generation === this._generation && QueryMetadataCache.hasResult(response) && response.meta !== undefined && response.meta.length > 0)
+            this.set(key, QueryMetadataCache.copy(response.meta));
+        return response;
+    }
+    static hasResult(response) {
+        return response.status === core_common_1.DbResponseStatus.Done || response.status === core_common_1.DbResponseStatus.Partial;
+    }
+}
+exports.QueryMetadataCache = QueryMetadataCache;
+//# sourceMappingURL=QueryMetadataCache.js.map

package/lib/cjs/internal/QueryMetadataCache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QueryMetadataCache.js","sourceRoot":"","sources":["../../../src/internal/QueryMetadataCache.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module ECDb\r\n */\r\n\r\nimport { DbQueryRequest, DbQueryResponse, DbResponseStatus, QueryPropertyMetaData } from \"@itwin/core-common\";\r\n\r\n/**\r\n * Caches the column metadata returned by concurrent query requests so that new [ECSqlReader]($common) instances for an\r\n * already-seen ECSQL can skip asking native to build and marshal it again.\r\n *\r\n * Column metadata only depends on the prepared statement (i.e. the schema) and the options that influence property naming.\r\n * The owning database clears it only in a full `clearCaches()`, together with its statement cache, so it stays exactly as\r\n * fresh as the metadata [ECSqlStatement]($backend) caches for `withPreparedStatement` and `withQueryReader`. Every path that\r\n * changes the schema must therefore do a full `clearCaches()`. Undo and redo never need to, because saving a schema txn\r\n * starts a new undo session, so undo/redo cannot cross a schema change.\r\n * A schema change made by another process to a file opened without change watching is not detected; the statement\r\n * cache has the same limitation.\r\n * @internal\r\n */\r\nexport class QueryMetadataCache {\r\n  public static readonly defaultCapacity = 200;\r\n  private readonly _entries = new Map<string, QueryPropertyMetaData[]>();\r\n  private _generation = 0;\r\n\r\n  public constructor(private readonly _capacity = QueryMetadataCache.defaultCapacity) { }\r\n\r\n  /** Number of cached entries. */\r\n  public get size(): number { return this._entries.size; }\r\n\r\n  /** Drop all cached metadata. Requests already in flight will not populate the cache. */\r\n  public clear(): void {\r\n    this._entries.clear();\r\n    ++this._generation;\r\n  }\r\n\r\n  private static makeKey(request: DbQueryRequest): string {\r\n    // eslint-disable-next-line @typescript-eslint/no-deprecated\r\n    return `${request.usePrimaryConn ? 1 : 0}|${request.valueFormat ?? 0}|${request.abbreviateBlobs ? 1 : 0}|${request.convertClassIdsToClassNames ? 1 : 0}|${request.query}`;\r\n  }\r\n\r\n  private static copy(properties: QueryPropertyMetaData[]): QueryPropertyMetaData[] {\r\n    return properties.map((property) => ({ ...property }));\r\n  }\r\n\r\n  private get(key: string): QueryPropertyMetaData[] | undefined {\r\n    const properties = this._entries.get(key);\r\n    if (properties && this._entries.size > 1) {\r\n      // Move to the most-recently-used position.\r\n      this._entries.delete(key);\r\n      this._entries.set(key, properties);\r\n    }\r\n    return properties;\r\n  }\r\n\r\n  private set(key: string, properties: QueryPropertyMetaData[]): void {\r\n    this._entries.delete(key);\r\n    this._entries.set(key, properties);\r\n    while (this._entries.size > this._capacity) {\r\n      const oldest = this._entries.keys().next().value as string;\r\n      this._entries.delete(oldest);\r\n    }\r\n  }\r\n\r\n  /**\r\n   * The cached counterpart of `executeQueryRequest`, serving column metadata from the cache when possible.\r\n   * On a cache hit, `executeQueryRequest` is called with `includeMetaData: false` and the cached metadata is attached to the response.\r\n   * On a miss, `executeQueryRequest` is called with the request unchanged and the returned metadata is cached.\r\n   * @param request The request to execute. It is not modified.\r\n   * @param executeQueryRequest Sends a request to native without consulting this cache, typically\r\n   * `ConcurrentQuery.executeQueryRequest` with the database already bound. Called once, or twice if the cache is cleared\r\n   * while a successful cache hit is in flight. The second call has no `restartToken`.\r\n   */\r\n  public async executeCachedQueryRequest(request: DbQueryRequest, executeQueryRequest: (request: DbQueryRequest) => Promise<DbQueryResponse>): Promise<DbQueryResponse> {\r\n    if (!request.includeMetaData)\r\n      return executeQueryRequest(request);\r\n\r\n    const key = QueryMetadataCache.makeKey(request);\r\n    const cached = this.get(key);\r\n    let missRequest = request;\r\n    if (cached) {\r\n      const hitGeneration = this._generation;\r\n      const hitResponse = await executeQueryRequest({ ...request, includeMetaData: false });\r\n      // Cancelled, failed or busy: there are no rows to describe, so hand the status back to the caller as is.\r\n      if (!QueryMetadataCache.hasResult(hitResponse))\r\n        return hitResponse;\r\n\r\n      if (hitGeneration === this._generation) {\r\n        if (hitResponse.meta === undefined || hitResponse.meta.length === 0)\r\n          hitResponse.meta = QueryMetadataCache.copy(cached);\r\n        return hitResponse;\r\n      }\r\n\r\n      // Invalidated while in flight: the cached metadata may not match the statement that produced the rows, so run\r\n      // the request again with metadata. Drop the restart token: a newer request may already be using it, and\r\n      // resubmitting with it would cancel that request.\r\n      missRequest = { ...request };\r\n      delete missRequest.restartToken;\r\n    }\r\n\r\n    const generation = this._generation;\r\n    const response = await executeQueryRequest(missRequest);\r\n    if (generation === this._generation && QueryMetadataCache.hasResult(response) && response.meta !== undefined && response.meta.length > 0)\r\n      this.set(key, QueryMetadataCache.copy(response.meta));\r\n    return response;\r\n  }\r\n\r\n  private static hasResult(response: DbQueryResponse): boolean {\r\n    return response.status === DbResponseStatus.Done || response.status === DbResponseStatus.Partial;\r\n  }\r\n}\r\n"]}

package/lib/esm/BriefcaseManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BriefcaseManager.d.ts","sourceRoot":"","sources":["../../src/BriefcaseManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BriefcaseManager.d.ts","sourceRoot":"","sources":["../../src/BriefcaseManager.ts"],"names":[],"mappings":"AAIA;;GAEG;AAMH,OAAO,EACL,WAAW,EAAE,UAAU,EAA6B,UAAU,EAAmD,QAAQ,EAC1H,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAEL,WAAW,EAAoB,cAAc,EAAE,kBAAkB,EAAE,cAAc,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAA6C,mBAAmB,EACrM,YAAY,EAAE,aAAa,EAAE,wBAAwB,EAEtD,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE9H,OAAO,EAAsC,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO7D,OAAO,EAAgB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAIpE;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC;IAClE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO,GAAG,kBAAkB,CAAC,CAAC;CAC9D;AAED;;EAEE;AACF,MAAM,WAAW,sBAAuB,SAAQ,QAAQ,EAAE,wBAAwB;IAChF;;OAEG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;CAC/B;AAED;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,8EAA8E;IAC9E,WAAW,EAAE,MAAM,CAAC;IACpB;;;;OAIG;IACH,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;IACtC,8IAA8I;IAC9I,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB,oGAAoG;IACpG,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,UAAU,CAAC;IAC7B,8FAA8F;IAC9F,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,uFAAuF;IACvF,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B;;;;OAIG;IACH,aAAa,CAAC,EAAE,IAAI,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,oFAAoF;IACpF,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAAG;IAC9C;;OAEG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B;;;;OAIG;IACH,aAAa,CAAC,EAAE,IAAI,CAAC;CACtB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,GAAG;IACzE;;OAEG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,qKAAqK;IACrK,OAAO,EAAE,cAAc,CAAC;IACxB,0EAA0E;IAC1E,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACzB;;;;;OAKG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;CAClD,CAAC;AAEF;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,gBAAgB;IAChB,gBAAuB,6BAA6B,+BAA+B;IAEnF,wFAAwF;WAC1E,aAAa,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY;IAE/D,gBAAgB;WACF,iBAAiB,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY;IAEnE,gBAAgB;WACF,sBAAsB,CAAC,QAAQ,EAAE,UAAU,GAAG,aAAa;IAEzE,gBAAgB;WACF,0BAA0B,CAAC,QAAQ,EAAE,UAAU,GAAG,aAAa;IAE7E,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAgB;IAC/C,gGAAgG;WAClF,oBAAoB,CAAC,QAAQ,EAAE,UAAU,GAAG,YAAY;IAItE;;;;OAIG;WACW,WAAW,CAAC,SAAS,EAAE,cAAc,GAAG,aAAa;IAInE,OAAO,CAAC,MAAM,CAAC,aAAa;IAK5B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAU;IACtC;;;;OAIG;WACW,UAAU,CAAC,YAAY,EAAE,YAAY;IAQnD,OAAO,CAAC,MAAM,CAAC,QAAQ;IAIvB;;;;OAIG;WACW,mBAAmB,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,mBAAmB,EAAE;IA8B/E,OAAO,CAAC,MAAM,CAAC,SAAS,CAAe;IACvC,qDAAqD;IACrD,WAAkB,QAAQ,IAAI,YAAY,CAA2B;IAErE;;OAEG;WACW,kBAAkB,CAAC,EAAE,EAAE,WAAW;IAIhD;;;OAGG;WACiB,qBAAqB,CAAC,GAAG,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9F;;;;;;;;;;;;;;;;;;;OAmBG;WACiB,iBAAiB,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+DhG;;OAEG;WACW,6BAA6B,CAAC,QAAQ,EAAE,MAAM;IAK5D;;;OAGG;WACiB,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxG;;;;;;;OAOG;WACiB,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAmD3G;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,UAAU;IAUzB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAclC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAenC;;OAEG;WACiB,kBAAkB,CAAC,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAIrG;;OAEG;WACiB,iBAAiB,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAI7F,4EAA4E;WACxD,cAAc,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,UAAU,CAAC;QAAC,SAAS,EAAE,kBAAkB,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAIzH,gFAAgF;WAC5D,eAAe,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAIpH,wEAAwE;WACpD,kBAAkB,CAAC,GAAG,EAAE;QAAE,QAAQ,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,cAAc,CAAC;IAI9F;;;OAGG;WACiB,iBAAiB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAI1F;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;mBAajB,oBAAoB;IAYzC,gBAAgB;WACI,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD9F;;;;;;;;;;;;;;OAcG;WACiB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,GAAG;QAAmB,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4I3I;;;;;;;OAOG;WACiB,kBAAkB,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAW1F;;;;;;OAMG;WACW,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAanE;;;;;;;OAOG;WACW,oBAAoB,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAiB1E,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAOlC;;;;;;OAMG;WACiB,YAAY,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY9E,4EAA4E;mBACvD,WAAW;IAiEhC;;OAEG;WACiB,aAAa,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BvF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAe;IACtD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAQ;IACzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAa;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAU;IAC7C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAe;IAErD;;;;;;OAMG;WACW,sCAAsC,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,gBAAgB,CAAC,cAAc,CAAC,GAAG,IAAI;IAuC7I;;;;;OAKG;WACW,sCAAsC,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM;IAI7E;;;;;;OAMG;WACW,6BAA6B,CAAC,CAAC,SAAS,aAAa,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,GAAG,IAAI;IAwB3I;;;;;;OAMG;WACW,gBAAgB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAMxE;;;;;;OAMG;WACkB,6BAA6B,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,aAAa,CAAC;IAWjH;;;;;;OAMG;WACW,gCAAgC,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAMvF;;;;;;OAMG;WACW,8BAA8B,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAMrF;;;;;OAKG;WACW,qBAAqB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAazE;;;;;MAKE;WACY,mBAAmB,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAavE;;;;;OAKG;WACW,mBAAmB,CAAC,EAAE,EAAE,WAAW,EAAE,YAAY,GAAE,OAAe,GAAG,IAAI;IAiBvF;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;CAapC"}

package/lib/esm/BriefcaseManager.js

@@ -552,6 +552,10 @@ export class BriefcaseManager {
                 Logger.logInfo(loggerCategory, `Dropping restore point ${this.PULL_MERGE_RESTORE_POINT_NAME}`);
                 this.dropRestorePoint(briefcaseDb, this.PULL_MERGE_RESTORE_POINT_NAME);
             }
+            // Local schema txns were reversed and reinstated without a full clear (semantic rebase clears per schema txn,
+            // but the regular rebase does not), so caches filled during the merge may describe the schema without them.
+            if (hasLocalSchemaTxn)
+                db.clearCaches();
         }
         // notify listeners
         db.notifyChangesetApplied();