@fluidframework/routerlicious-driver 2.0.0-dev.5.2.0.169897 → 2.0.0-dev.6.4.0.191258

package/src/wholeSummaryDocumentStorageService.ts

@@ -4,12 +4,8 @@
  */
 
 import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
-import {
-	assert,
-	performance,
-	stringToBuffer,
-	Uint8ArrayToString,
-} from "@fluidframework/common-utils";
+import { performance, stringToBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
+import { assert } from "@fluidframework/core-utils";
 import { getW3CData, promiseRaceWithWinner } from "@fluidframework/driver-base";
 import {
 	IDocumentStorageService,
@@ -23,7 +19,6 @@ import {
 	ISummaryTree,
 	IVersion,
 } from "@fluidframework/protocol-definitions";
-import { IWholeFlatSummary } from "@fluidframework/server-services-client";
 import { ICache, InMemoryCache } from "./cache";
 import { IRouterliciousDriverPolicies } from "./policies";
 import {
@@ -35,8 +30,8 @@ import { GitManager } from "./gitManager";
 import { WholeSummaryUploadManager } from "./wholeSummaryUploadManager";
 import { ISummaryUploadManager } from "./storageContracts";
 import { IR11sResponse } from "./restWrapper";
-import { INormalizedWholeSummary } from "./contracts";
-import { convertWholeFlatSummaryToSnapshotTreeAndBlobs } from "./r11sSnapshotParser";
+import { INormalizedWholeSnapshot, IWholeFlatSnapshot } from "./contracts";
+import { convertWholeFlatSnapshotToSnapshotTreeAndBlobs } from "./r11sSnapshotParser";
 
 const latestSnapshotId: string = "latest";
 
@@ -59,7 +54,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 		public readonly policies: IDocumentStorageServicePolicies,
 		private readonly driverPolicies?: IRouterliciousDriverPolicies,
 		private readonly blobCache: ICache<ArrayBufferLike> = new InMemoryCache(),
-		private readonly snapshotTreeCache: ICache<INormalizedWholeSummary> = new InMemoryCache(),
+		private readonly snapshotTreeCache: ICache<INormalizedWholeSnapshot> = new InMemoryCache(),
 		private readonly noCacheGitManager?: GitManager,
 		private readonly getStorageManager: (
 			disableCache?: boolean,
@@ -243,7 +238,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 	}
 
 	public async downloadSummary(summaryHandle: ISummaryHandle): Promise<ISummaryTree> {
-		const wholeFlatSummary = await PerformanceEvent.timedExecAsync(
+		const wholeFlatSnapshot = await PerformanceEvent.timedExecAsync(
 			this.logger,
 			{
 				eventName: "getWholeFlatSummary",
@@ -251,7 +246,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 			},
 			async (event) => {
 				const manager = await this.getStorageManager();
-				const response = await manager.getSummary(summaryHandle.handle);
+				const response = await manager.getSnapshot(summaryHandle.handle);
 				event.end({
 					size: response.content.trees[0]?.entries.length,
 				});
@@ -259,8 +254,8 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 			},
 		);
 
-		const { blobs, snapshotTree } = convertWholeFlatSummaryToSnapshotTreeAndBlobs(
-			wholeFlatSummary,
+		const { blobs, snapshotTree } = convertWholeFlatSnapshotToSnapshotTreeAndBlobs(
+			wholeFlatSnapshot,
 			"",
 		);
 		return convertSnapshotAndBlobsToSummaryTree(snapshotTree, blobs);
@@ -291,7 +286,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 		versionId: string,
 		disableCache?: boolean,
 		scenarioName?: string,
-	): Promise<INormalizedWholeSummary> {
+	): Promise<INormalizedWholeSnapshot> {
 		const normalizedWholeSummary = await PerformanceEvent.timedExecAsync(
 			this.logger,
 			{
@@ -301,12 +296,12 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 			},
 			async (event) => {
 				const manager = await this.getStorageManager(disableCache);
-				const response: IR11sResponse<IWholeFlatSummary> = await manager.getSummary(
+				const response: IR11sResponse<IWholeFlatSnapshot> = await manager.getSnapshot(
 					versionId,
 				);
 				const start = performance.now();
-				const snapshot: INormalizedWholeSummary =
-					convertWholeFlatSummaryToSnapshotTreeAndBlobs(response.content);
+				const snapshot: INormalizedWholeSnapshot =
+					convertWholeFlatSnapshotToSnapshotTreeAndBlobs(response.content);
 				const snapshotConversionTime = performance.now() - start;
 				validateBlobsAndTrees(snapshot.snapshotTree);
 				const { trees, numBlobs, encodedBlobsSize } = evalBlobsAndTrees(snapshot);
@@ -333,7 +328,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
 	}
 
 	private async initializeFromSnapshot(
-		normalizedWholeSummary: INormalizedWholeSummary,
+		normalizedWholeSummary: INormalizedWholeSnapshot,
 	): Promise<string> {
 		const snapshotId = normalizedWholeSummary.id;
 		assert(snapshotId !== undefined, 0x275 /* "Root tree should contain the id" */);