@fluidframework/runtime-utils 2.0.0-dev.1.4.6.106135 → 2.0.0-dev.2.2.0.111723

package/src/summarizerNode/summarizerNode.ts

@@ -166,15 +166,10 @@ export class SummarizerNode implements IRootSummarizerNode {
         // If there is no latestSummary, clearSummary and return before reaching this code.
         assert(!!localPathsToUse, 0x1a5 /* "Tracked summary local paths not set" */);
 
-        // DataStore can be realized out-of-order during the summary execution (ex. the mixinSummaryHandler
-        // in order to provide search capability to the summaries). If that happens,
-        // a child node will not have the handle paths with ".channels".
-        // By using the _latestSummary's basePath we have a safe path to compose its pendingSummary.
-        // PR: https://github.com/microsoft/FluidFramework/pull/11697
         const summary = new SummaryNode({
             ...localPathsToUse,
             referenceSequenceNumber: this.wipReferenceSequenceNumber,
-            basePath: parentSkipRecursion ? this._latestSummary?.basePath ?? parentPath : parentPath,
+            basePath: parentPath,
         });
         const fullPathForChildren = summary.fullPathForChildren;
         for (const child of this.children.values()) {
@@ -357,7 +352,7 @@ export class SummarizerNode implements IRootSummarizerNode {
         }
     }
 
-    public loadBaseSummaryWithoutDifferential(snapshot: ISnapshotTree) {
+    public updateBaseSummaryState(snapshot: ISnapshotTree) {
         // Check base summary to see if it has any additional path parts
         // separating child SummarizerNodes. Checks for .channels subtrees.
         const { childrenPathPart } = parseSummaryForSubtrees(snapshot);
@@ -366,23 +361,6 @@ export class SummarizerNode implements IRootSummarizerNode {
         }
     }
 
-    public async loadBaseSummary(
-        snapshot: ISnapshotTree,
-        readAndParseBlob: ReadAndParseBlob,
-    ): Promise<ISnapshotTree> {
-        const pathParts: string[] = [];
-        const { childrenPathPart } = parseSummaryForSubtrees(snapshot);
-        if (childrenPathPart !== undefined) {
-            pathParts.push(childrenPathPart);
-        }
-
-        if (pathParts.length > 0 && this._latestSummary !== undefined) {
-            this._latestSummary.additionalPath = EscapedPath.createAndConcat(pathParts);
-        }
-
-        return snapshot;
-    }
-
     public recordChange(op: ISequencedDocumentMessage): void {
         this.invalidate(op.sequenceNumber);
     }

package/src/summarizerNode/summarizerNodeWithGc.ts

@@ -12,7 +12,6 @@ import {
     gcBlobKey,
     IGarbageCollectionData,
     IGarbageCollectionDetailsBase,
-    IGarbageCollectionSummaryDetails,
     ISummarizeInternalResult,
     ISummarizeResult,
     ISummarizerNodeConfigWithGC,
@@ -80,9 +79,6 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
     // removed (from runGC flag in IContainerRuntimeOptions), this should be changed to be have no routes by default.
     private usedRoutes: string[] = [""];
 
-    // If this node is marked as unreferenced, the time when it marked as such.
-    private unreferencedTimestampMs: number | undefined;
-
     // True if GC is disabled for this node. If so, do not track GC specific state for a summary.
     private readonly gcDisabled: boolean;
 
@@ -124,22 +120,6 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
         });
     }
 
-    /**
-     * @deprecated Renamed to {@link SummarizerNodeWithGC.getBaseGCDetails}.
-     */
-    public getGCSummaryDetails(): IGarbageCollectionSummaryDetails {
-        return this.getBaseGCDetails();
-    }
-
-    // Returns the GC details to be added to this node's summary and is used to initialize new nodes' GC state.
-    public getBaseGCDetails(): IGarbageCollectionDetailsBase {
-        return {
-            gcData: this.gcData,
-            usedRoutes: this.usedRoutes,
-            unrefTimestamp: this.unreferencedTimestampMs,
-        };
-    }
-
     /**
      * Loads state from this node's initial GC summary details. This contains the following data from the last summary
      * seen by the server for this client:
@@ -163,7 +143,6 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
         // Sort the used routes because we compare them with the current used routes to check if they changed between
         // summaries. Both are sorted so that the order of elements is the same.
         this.referenceUsedRoutes = baseGCDetails.usedRoutes?.sort();
-        this.unreferencedTimestampMs = baseGCDetails.unrefTimestamp;
     }
 
     public async summarize(
@@ -379,7 +358,7 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
         return this.usedRoutes.includes("") || this.usedRoutes.includes("/");
     }
 
-    public updateUsedRoutes(usedRoutes: string[], gcTimestamp?: number) {
+    public updateUsedRoutes(usedRoutes: string[]) {
         // Sort the given routes before updating. This will ensure that the routes compared in hasUsedStateChanged()
         // are in the same order.
         this.usedRoutes = usedRoutes.sort();
@@ -389,16 +368,6 @@ export class SummarizerNodeWithGC extends SummarizerNode implements IRootSummari
         if (!this.gcDisabled && this.isTrackingInProgress()) {
             this.wipSerializedUsedRoutes = JSON.stringify(this.usedRoutes);
         }
-
-        if (this.isReferenced()) {
-            this.unreferencedTimestampMs = undefined;
-            return;
-        }
-
-        // If this node just became unreferenced, update its unreferencedTimestampMs.
-        if (this.unreferencedTimestampMs === undefined) {
-            this.unreferencedTimestampMs = gcTimestamp;
-        }
     }
 
     /**