@fluidframework/datastore 0.59.2000 → 0.59.3000-67119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "0.59.2000",
+  "version": "0.59.3000-67119",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -64,26 +64,27 @@
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
     "@fluidframework/container-definitions": "^0.48.1000",
-    "@fluidframework/container-utils": "^0.59.2000",
+    "@fluidframework/container-utils": "0.59.3000-67119",
     "@fluidframework/core-interfaces": "^0.43.1000",
-    "@fluidframework/datastore-definitions": "^0.59.2000",
+    "@fluidframework/datastore-definitions": "0.59.3000-67119",
     "@fluidframework/driver-definitions": "^0.46.1000",
-    "@fluidframework/driver-utils": "^0.59.2000",
-    "@fluidframework/garbage-collector": "^0.59.2000",
-    "@fluidframework/protocol-base": "^0.1036.1000",
+    "@fluidframework/driver-utils": "0.59.3000-67119",
+    "@fluidframework/garbage-collector": "0.59.3000-67119",
+    "@fluidframework/protocol-base": "^0.1036.3000-66438",
     "@fluidframework/protocol-definitions": "^0.1028.1000",
-    "@fluidframework/runtime-definitions": "^0.59.2000",
-    "@fluidframework/runtime-utils": "^0.59.2000",
-    "@fluidframework/telemetry-utils": "^0.59.2000",
+    "@fluidframework/runtime-definitions": "0.59.3000-67119",
+    "@fluidframework/runtime-utils": "0.59.3000-67119",
+    "@fluidframework/telemetry-utils": "0.59.3000-67119",
     "lodash": "^4.17.21",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@0.59.1000",
-    "@fluidframework/eslint-config-fluid": "^0.28.1000",
-    "@fluidframework/mocha-test-setup": "^0.59.2000",
-    "@fluidframework/test-runtime-utils": "^0.59.2000",
+    "@fluidframework/build-tools": "^0.2.66793",
+    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@0.59.2000",
+    "@fluidframework/eslint-config-fluid": "^0.28.2000-0",
+    "@fluidframework/mocha-test-setup": "0.59.3000-67119",
+    "@fluidframework/test-runtime-utils": "0.59.3000-67119",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^8.2.2",
@@ -107,11 +108,11 @@
     "mocha": "^8.4.0",
     "nyc": "^15.0.0",
     "rimraf": "^2.6.2",
-    "typescript": "~4.1.3",
+    "typescript": "~4.5.5",
     "typescript-formatter": "7.1.0"
   },
   "typeValidation": {
-    "version": "0.59.2000",
+    "version": "0.59.3000",
     "broken": {}
   }
 }

package/src/channelStorageService.ts

@@ -10,7 +10,7 @@ import { getNormalizedObjectStoragePathParts } from "@fluidframework/runtime-uti
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 
 export class ChannelStorageService implements IChannelStorageService {
-    private static flattenTree(base: string, tree: ISnapshotTree, results: { [path: string]: string }) {
+    private static flattenTree(base: string, tree: ISnapshotTree, results: { [path: string]: string; }) {
         // eslint-disable-next-line guard-for-in, no-restricted-syntax
         for (const path in tree.trees) {
             ChannelStorageService.flattenTree(`${base}${path}/`, tree.trees[path], results);
@@ -22,7 +22,7 @@ export class ChannelStorageService implements IChannelStorageService {
         }
     }
 
-    private readonly flattenedTree: { [path: string]: string };
+    private readonly flattenedTree: { [path: string]: string; };
 
     constructor(
         private readonly tree: ISnapshotTree | undefined,
@@ -51,7 +51,7 @@ export class ChannelStorageService implements IChannelStorageService {
             return blob;
         }
         const blobP = this.storage.readBlob(id);
-        blobP.catch((error) => this.logger.sendErrorEvent({ eventName: "ChannelStorageBlobError"}, error));
+        blobP.catch((error) => this.logger.sendErrorEvent({ eventName: "ChannelStorageBlobError" }, error));
 
         return blobP;
     }

package/src/dataStoreRuntime.ts

@@ -69,6 +69,7 @@ import {
 } from "@fluidframework/datastore-definitions";
 import {
     GCDataBuilder,
+    removeRouteFromAllNodes,
     unpackChildNodesGCDetails,
     unpackChildNodesUsedRoutes,
 } from "@fluidframework/garbage-collector";
@@ -183,7 +184,7 @@ IFluidDataStoreChannel, IFluidDataStoreRuntime, IFluidHandleContext {
         this.logger = ChildLogger.create(
             dataStoreContext.logger,
             "FluidDataStoreRuntime",
-            {all:{ dataStoreId: uuid() }},
+            { all: { dataStoreId: uuid() } },
         );
 
         this.id = dataStoreContext.id;
@@ -675,6 +676,10 @@ IFluidDataStoreChannel, IFluidDataStoreRuntime, IFluidHandleContext {
         let channelBaseGCDetails = (await this.channelsBaseGCDetails).get(channelId);
         if (channelBaseGCDetails === undefined) {
             channelBaseGCDetails = {};
+        } else if (channelBaseGCDetails.gcData?.gcNodes !== undefined) {
+            // Note: if the child channel has an explicit handle route to its parent, it will be removed here and
+            // expected to be added back by the parent when getGCData is called.
+            removeRouteFromAllNodes(channelBaseGCDetails.gcData.gcNodes, this.absolutePath);
         }
 
         // Currently, channel context's are always considered used. So, it there are no used routes for it, we still
@@ -703,13 +708,7 @@ IFluidDataStoreChannel, IFluidDataStoreRuntime, IFluidHandleContext {
                 // (i.e. it has a base mapping) - then we go ahead and summarize
                 return isAttached;
             }).map(async ([contextId, context]) => {
-                // If BlobAggregationStorage is engaged, we have to write full summary for data stores
-                // BlobAggregationStorage relies on this behavior, as it aggregates blobs across DDSs.
-                // Not generating full summary will mean data loss, as we will overwrite aggregate blob in new summary,
-                // and any virtual blobs that stayed (for unchanged DDSs) will need aggregate blob in previous summary
-                // that is no longer present in this summary.
-                // This is temporal limitation that can be lifted in future once BlobAggregationStorage becomes smarter.
-                const contextSummary = await context.summarize(true /* fullTree */, trackState);
+                const contextSummary = await context.summarize(fullTree, trackState);
                 summaryBuilder.addWithStats(contextId, contextSummary);
             }));
 
@@ -958,7 +957,7 @@ export const mixinRequestHandler = (
  * @param Base - base class, inherits from FluidDataStoreRuntime
  */
 export const mixinSummaryHandler = (
-    handler: (runtime: FluidDataStoreRuntime) => Promise<{ path: string[], content: string } | undefined >,
+    handler: (runtime: FluidDataStoreRuntime) => Promise<{ path: string[]; content: string; } | undefined >,
     Base: typeof FluidDataStoreRuntime = FluidDataStoreRuntime,
 ) => class RuntimeWithSummarizerHandler extends Base {
         private addBlob(summary: ISummaryTreeWithStats, path: string[], content: string) {

package/src/localChannelContext.ts

@@ -46,8 +46,8 @@ export abstract class LocalChannelContextBase implements IChannelContext {
         protected readonly registry: ISharedObjectRegistry,
         protected readonly runtime: IFluidDataStoreRuntime,
         private readonly servicesGetter: () => Lazy<{
-                readonly deltaConnection: ChannelDeltaConnection,
-                readonly objectStorage: ChannelStorageService,
+                readonly deltaConnection: ChannelDeltaConnection;
+                readonly objectStorage: ChannelStorageService;
             }>,
     ) {
     }
@@ -142,8 +142,8 @@ export abstract class LocalChannelContextBase implements IChannelContext {
 
 export class RehydratedLocalChannelContext extends LocalChannelContextBase {
     private readonly services: Lazy<{
-        readonly deltaConnection: ChannelDeltaConnection,
-        readonly objectStorage: ChannelStorageService,
+        readonly deltaConnection: ChannelDeltaConnection;
+        readonly objectStorage: ChannelStorageService;
     }>;
 
     private readonly dirtyFn: () => void;
@@ -232,7 +232,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
         blobMap: Map<string, ArrayBufferLike>,
     ): boolean {
         let sanitize = false;
-        const blobsContents: {[path: string]: ArrayBufferLike} = (snapshotTree as any).blobsContents;
+        const blobsContents: { [path: string]: ArrayBufferLike; } = (snapshotTree as any).blobsContents;
         Object.entries(blobsContents).forEach(([key, value]) => {
             blobMap.set(key, value);
             if (snapshotTree.blobs[key] !== undefined) {
@@ -262,8 +262,8 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 
 export class LocalChannelContext extends LocalChannelContextBase {
     private readonly services: Lazy<{
-        readonly deltaConnection: ChannelDeltaConnection,
-        readonly objectStorage: ChannelStorageService,
+        readonly deltaConnection: ChannelDeltaConnection;
+        readonly objectStorage: ChannelStorageService;
     }>;
     private readonly dirtyFn: () => void;
     constructor(

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/datastore";
-export const pkgVersion = "0.59.2000";
+export const pkgVersion = "0.59.3000-67119";

package/src/remoteChannelContext.ts

@@ -45,8 +45,8 @@ export class RemoteChannelContext implements IChannelContext {
     private channelP: Promise<IChannel> | undefined;
     private channel: IChannel | undefined;
     private readonly services: {
-        readonly deltaConnection: ChannelDeltaConnection,
-        readonly objectStorage: ChannelStorageService,
+        readonly deltaConnection: ChannelDeltaConnection;
+        readonly objectStorage: ChannelStorageService;
     };
     private readonly summarizerNode: ISummarizerNodeWithGC;
     private readonly subLogger: ITelemetryLogger;
@@ -173,7 +173,10 @@ export class RemoteChannelContext implements IChannelContext {
             if (this.attachMessageType === undefined) {
                 // TODO: dataStoreId may require a different tag from PackageData #7488
                 throw new DataCorruptionError("channelTypeNotAvailable", {
-                    channelId: this.id,
+                    channelId: {
+                        value: this.id,
+                        tag: TelemetryDataTag.PackageData,
+                    },
                     dataStoreId: {
                         value: this.dataStoreContext.id,
                         tag: TelemetryDataTag.PackageData,
@@ -185,7 +188,10 @@ export class RemoteChannelContext implements IChannelContext {
             if (factory === undefined) {
                 // TODO: dataStoreId may require a different tag from PackageData #7488
                 throw new DataCorruptionError("channelFactoryNotRegisteredForAttachMessageType", {
-                    channelId: this.id,
+                    channelId: {
+                        value: this.id,
+                        tag: TelemetryDataTag.PackageData,
+                    },
                     dataStoreId: {
                         value: this.dataStoreContext.id,
                         tag: TelemetryDataTag.PackageData,
@@ -200,7 +206,10 @@ export class RemoteChannelContext implements IChannelContext {
             if (factory === undefined) {
                 // TODO: dataStoreId may require a different tag from PackageData #7488
                 throw new DataCorruptionError("channelFactoryNotRegisteredForGivenType", {
-                    channelId: this.id,
+                    channelId: {
+                        value: this.id,
+                        tag: TelemetryDataTag.PackageData,
+                    },
                     dataStoreId: {
                         value: this.dataStoreContext.id,
                         tag: TelemetryDataTag.PackageData,
@@ -217,7 +226,7 @@ export class RemoteChannelContext implements IChannelContext {
                 this.subLogger.sendTelemetryEvent(
                     {
                         eventName: "ChannelAttributesVersionMismatch",
-                        channelType: {value: attributes.type, tag: TelemetryDataTag.PackageData},
+                        channelType: { value: attributes.type, tag: TelemetryDataTag.PackageData },
                         channelSnapshotVersion: {
                             value: `${attributes.snapshotFormatVersion}@${attributes.packageVersion}`,
                             tag: TelemetryDataTag.PackageData,