@fluidframework/container-runtime 2.60.0 → 2.61.0-355054

package/src/blobManager/blobManagerSnapSum.ts

@@ -3,11 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import {
-	AttachState,
-	type IContainerContext,
-} from "@fluidframework/container-definitions/internal";
-import { assert } from "@fluidframework/core-utils/internal";
+import type { IContainerContext } from "@fluidframework/container-definitions/internal";
 import { readAndParse } from "@fluidframework/driver-utils/internal";
 import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/internal";
 import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
@@ -60,72 +56,54 @@ const loadV1 = async (
 export const toRedirectTable = (
 	blobManagerLoadInfo: IBlobManagerLoadInfo,
 	logger: ITelemetryLoggerExt,
-	attachState: AttachState,
-): Map<string, string | undefined> => {
+): Map<string, string> => {
 	logger.sendTelemetryEvent({
 		eventName: "AttachmentBlobsLoaded",
 		count: blobManagerLoadInfo.ids?.length ?? 0,
 		redirectTable: blobManagerLoadInfo.redirectTable?.length,
 	});
-	const redirectTable = new Map<string, string | undefined>(blobManagerLoadInfo.redirectTable);
-	const detached = attachState !== AttachState.Attached;
-	if (blobManagerLoadInfo.ids) {
-		// If we are detached, we don't have storage IDs yet, so set to undefined
-		// Otherwise, set identity (id -> id) entries.
-		for (const entry of blobManagerLoadInfo.ids) {
-			redirectTable.set(entry, detached ? undefined : entry);
+	const redirectTable = new Map<string, string>(blobManagerLoadInfo.redirectTable);
+	if (blobManagerLoadInfo.ids !== undefined) {
+		for (const storageId of blobManagerLoadInfo.ids) {
+			// Older versions of the runtime used the storage ID directly in the handle,
+			// rather than routing through the redirectTable. To support old handles that
+			// were created in this way but unify handling through the redirectTable, we
+			// add identity mappings to the redirect table at load. These identity entries
+			// will be excluded during summarization.
+			redirectTable.set(storageId, storageId);
 		}
 	}
 	return redirectTable;
 };
 
 export const summarizeBlobManagerState = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): ISummaryTreeWithStats => summarizeV1(redirectTable, attachState);
+	redirectTable: Map<string, string>,
+): ISummaryTreeWithStats => summarizeV1(redirectTable);
 
-const summarizeV1 = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): ISummaryTreeWithStats => {
-	const storageIds = getStorageIds(redirectTable, attachState);
-
-	// if storageIds is empty, it means we are detached and have only local IDs, or that there are no blobs attached
-	const blobIds = storageIds.size > 0 ? [...storageIds] : [...redirectTable.keys()];
+const summarizeV1 = (redirectTable: Map<string, string>): ISummaryTreeWithStats => {
 	const builder = new SummaryTreeBuilder();
-	for (const blobId of blobIds) {
-		builder.addAttachment(blobId);
+	const storageIds = getStorageIds(redirectTable);
+	for (const storageId of storageIds) {
+		// The Attachment is inspectable by storage, which lets it detect that the blob is referenced
+		// and therefore should not be GC'd.
+		builder.addAttachment(storageId);
 	}
 
-	// Any non-identity entries in the table need to be saved in the summary
-	if (redirectTable.size > blobIds.length) {
-		builder.addBlob(
-			redirectTableBlobName,
-			// filter out identity entries
-			JSON.stringify(
-				[...redirectTable.entries()].filter(([localId, storageId]) => localId !== storageId),
-			),
-		);
+	// Exclude identity mappings from the redirectTable summary. Note that
+	// the storageIds of the identity mappings are still included in the Attachments
+	// above, so we expect these identity mappings will be recreated at load
+	// time in toRedirectTable even if there is no non-identity mapping in
+	// the redirectTable.
+	const nonIdentityRedirectTableEntries = [...redirectTable.entries()].filter(
+		([localId, storageId]) => localId !== storageId,
+	);
+	if (nonIdentityRedirectTableEntries.length > 0) {
+		builder.addBlob(redirectTableBlobName, JSON.stringify(nonIdentityRedirectTableEntries));
 	}
 
 	return builder.getSummaryTree();
 };
 
-export const getStorageIds = (
-	redirectTable: Map<string, string | undefined>,
-	attachState: AttachState,
-): Set<string> => {
-	const ids = new Set<string | undefined>(redirectTable.values());
-
-	// If we are detached, we will not have storage IDs, only undefined
-	const undefinedValueInTable = ids.delete(undefined);
-
-	// For a detached container, entries are inserted into the redirect table with an undefined storage ID.
-	// For an attached container, entries are inserted w/storage ID after the BlobAttach op round-trips.
-	assert(
-		!undefinedValueInTable || (attachState === AttachState.Detached && ids.size === 0),
-		0x382 /* 'redirectTable' must contain only undefined while detached / defined values while attached */,
-	);
-
-	return ids as Set<string>;
+export const getStorageIds = (redirectTable: Map<string, string>): Set<string> => {
+	return new Set<string>(redirectTable.values());
 };

package/src/containerRuntime.ts

@@ -3708,7 +3708,7 @@ export class ContainerRuntime
 		telemetryContext?: ITelemetryContext,
 	): ISummaryTree {
 		if (blobRedirectTable) {
-			this.blobManager.setRedirectTable(blobRedirectTable);
+			this.blobManager.patchRedirectTable(blobRedirectTable);
 		}
 
 		// We can finalize any allocated IDs since we're the only client

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.60.0";
+export const pkgVersion = "2.61.0-355054";