Skip to content

Commit 1a0af94

Browse files
authored
Unify getKeyForCacheEntry functions (#25403)
Splitting up changes from #25337. Have only one implementation of getKeyForCacheEntry across odsp-driver and driver-web-cache.
1 parent f2a86d1 commit 1a0af94

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

packages/drivers/driver-web-cache/src/FluidCacheIndexedDb.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
*/
55

66
import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
7-
import { ICacheEntry } from "@fluidframework/odsp-driver-definitions/internal";
7+
import {
8+
ICacheEntry,
9+
getKeyForCacheEntry as odspGetKeyForCacheEntry,
10+
} from "@fluidframework/odsp-driver-definitions/internal";
811
import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
912
import { DBSchema, DeleteDBCallbacks, IDBPDatabase, deleteDB, openDB } from "idb";
1013

@@ -25,7 +28,7 @@ export const oldVersionNameMapping: Partial<{ [key: number]: string }> = {
2528
};
2629

2730
export function getKeyForCacheEntry(entry: ICacheEntry) {
28-
return `${entry.file.docId}_${entry.type}_${entry.key}`;
31+
return odspGetKeyForCacheEntry(entry);
2932
}
3033

3134
export function getFluidCacheIndexedDbInstance(

packages/drivers/odsp-driver-definitions/api-report/odsp-driver-definitions.legacy.beta.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export interface IEntry {
5656
// @beta @legacy (undocumented)
5757
export interface IFileEntry {
5858
docId: string;
59+
fileVersion?: string;
5960
resolvedUrl: IResolvedUrl;
6061
}
6162

packages/drivers/odsp-driver-definitions/src/odspCache.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ export interface IFileEntry {
5353
* This is IOdspResolvedUrl in case of ODSP driver.
5454
*/
5555
resolvedUrl: IResolvedUrl;
56+
/**
57+
* Optional version of the file.
58+
*/
59+
fileVersion?: string;
5660
}
5761

5862
/**

0 commit comments

Comments
 (0)