Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removal of TreeEntry.Commit and ISnapshotTree.commit #9520

Merged
merged 6 commits into from
Mar 23, 2022

Conversation

NicholasCouri
Copy link
Contributor

@NicholasCouri NicholasCouri commented Mar 17, 2022

TreeEntry.Commit and ISnapshotTree.commits from protocol-definitions

Additional changes coming afterwards on client and server are being tracked by the PR [#9521].

ISnapshotTree.commits from protocol-definitions
@NicholasCouri NicholasCouri requested review from a team as code owners March 17, 2022 22:28
@github-actions github-actions bot added breaking change This PR or issue would introduce a breaking change public api change Changes to a public API labels Mar 17, 2022
BREAKING.md Outdated
@@ -24,6 +24,7 @@ There are a few steps you can take to write a good change note and avoid needing
- [Set raiseContainerWarning property as optional parameter on IContainerContext](#Set-raiseContainerWarning-property-as-optional-parameter-on-IContainerContext)
- [Consolidate fluidErrorCode and message on FF Errors](#Consolidate-fluidErrorCode-and-message-on-FF-Errors)
- [Doing operations not allowed on deleted sub directory](#Doing-operations-not-allowed-on-deleted-sub-directory)
- [Removing Commit from TreeEntry and commits from SnapShotTree](#Removing-Commit-from-TreeEntre-and-commits-from-SnapShotTree)
Copy link
Member

@tylerbutler tylerbutler Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- [Removing Commit from TreeEntry and commits from SnapShotTree](#Removing-Commit-from-TreeEntre-and-commits-from-SnapShotTree)
- [Removing Commit from TreeEntry and commits from SnapShotTree](#Removing-Commit-from-TreeEntry-and-commits-from-SnapShotTree)
``` #Resolved

BREAKING.md Outdated
@@ -24,6 +24,7 @@ There are a few steps you can take to write a good change note and avoid needing
- [Set raiseContainerWarning property as optional parameter on IContainerContext](#Set-raiseContainerWarning-property-as-optional-parameter-on-IContainerContext)
- [Consolidate fluidErrorCode and message on FF Errors](#Consolidate-fluidErrorCode-and-message-on-FF-Errors)
- [Doing operations not allowed on deleted sub directory](#Doing-operations-not-allowed-on-deleted-sub-directory)
- [Removing Commit from TreeEntry and commits from SnapShotTree](#Removing-Commit-from-TreeEntre-and-commits-from-SnapShotTree)
Copy link
Contributor

@heliocliu heliocliu Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also create a new section for 0.59 and put this in there? next should be on 0.59.1000 but that change got lost with all the other version stuff that was happening #Resolved

Copy link
Contributor

@andre4i andre4i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a short description about why these are going away (Or if they're part of solving a larger issue)?

BREAKING.md Outdated
@@ -50,6 +51,9 @@ sometimes followed by a colon and an inner error message when applicable.
Users will not be allowed to do operations on a deleted directory. Users can subscribe to `disposed` event to know if a sub directory is deleted. Accessing deleted sub directory
will throw `UsageError` exception now.

### Removing Commit from TreeEntry and commits from SnapShotTree
TreeEntry will no longer contain the property Commit and the same goes for commits from ISnapshotTree.
Copy link
Contributor

@andre4i andre4i Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there's a replacement for this or any other information which may be useful for clients migrating off using this, please add it here. #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there is a replacement - they are not used at all, I believe.

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 17, 2022

My understanding is they are never used in the code. There are even asserts to make sure they are not used :)


In reply to: 913779890



### Removing Commit from TreeEntry and commits from SnapShotTree
Cleaning up properties that are not being used in the codebase: `TreeEntry.Commit` and `ISnapshotTree.commits`.
Copy link
Contributor

@heliocliu heliocliu Mar 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Cleaning up properties that are not being used in the codebase: `TreeEntry.Commit` and `ISnapshotTree.commits`.
Cleaning up properties that are not being used in the codebase: `TreeEntry.Commit` and `ISnapshotTree.commits`. These should not be used and there is no replacement provided.

if there is intentionally no replacement this may be worth calling out just in case, but up to you. #Resolved

heliocliu
heliocliu previously approved these changes Mar 17, 2022
Copy link
Contributor

@heliocliu heliocliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it sounds like you won't need to, but if you intend to integrate a new version of protocol-definitions into the rest of the repo let me know since i don't think that process is super smoothed out for next yet

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 17, 2022

it sounds like you won't need to, but if you intend to integrate a new version of protocol-definitions into the rest of the repo let me know since i don't think that process is super smoothed out for next yet


In reply to: 913802304

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 17, 2022

// 160000 for submodule (commit), or 120000 for a blob that specifies the path of a symlink

remove. #Resolved


Refers to: common/lib/protocol-definitions/src/storage.ts:56 in 550fe4c. [](commit_id = 550fe4c, deletion_comment = False)

@vladsud
Copy link
Contributor

vladsud commented Mar 17, 2022

I'm almost certain that it will not fly as is :)
This item is great in terms of learning how our builds work. We do have 3 independent builds - definitions, server packages and client packages. You are changing definition packages, and once packages are produces and published, we will bump versions in client & server packages to consume new definitions and I'm almost sure things will break.
Some of these breaks will be fine (i.e. we should change client / server code not to depend on such constructs, or move to dedicated interfaces). But some might be impossible to address in one go.

For that reason, I'd recommend linking these isolated mono-repos and building as one thing, to learn about all side-effects and make a draft with all changes. Once it's done, we can break it into independent PRs (definitions, server, client) to be completed in this order.

@scarlettjlee, can you please help Nicholas here with advice and support?


In reply to: 1071815583


In reply to: 1071815583


In reply to: 1071815583

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 17, 2022 via email

@vladsud
Copy link
Contributor

vladsud commented Mar 17, 2022

Some notes on specific interfaces:
FileMode : I'd think it's used only by R11s stack. If so, we should figure out how to move it out from definitions. r11s client & service may still need to share definitions, so maybe we need r11s-definitions package for that.
ISnapshotTree: we should move commit and ID out to ISnapshotTreeEx - that's the interface I've created to let r11s stack to continue to use these concepts but not have them in client code
ITreeEntry, TreeEntry: I think they need to follow similar pattern. I.e. these concepts are used in client code, and that's where there is no such notion as comit. But if they are used in r11s stack and it has such concept, then we need to have separate interface for it.


In reply to: 1071827629

@vladsud
Copy link
Contributor

vladsud commented Mar 17, 2022

Great to see #9521
I'd recommend you get it to working condition before merging this PR.
But you need similar one for server code I'd think.


In reply to: 1071833210


In reply to: 1071833210

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 17, 2022 via email

@NicholasCouri
Copy link
Contributor Author

will do - the uts were passing - will check with Scarlett on what to test to validate further.


In reply to: 1071833210

@heliocliu heliocliu dismissed their stale review March 19, 2022 00:48

per vlad's notes, dismissing to prevent merge until that question is resolved

@NicholasCouri
Copy link
Contributor Author

@vladsud @andre4i @heliocliu I just shared the PR with @znewton and he was letting me know that R11s has not made use of TreeEntry.Commit for a long time (maybe ever) and it should be safe to remove those definitions without worry in R11s.
Are there any additional concerns ?

@vladsud
Copy link
Contributor

vladsud commented Mar 23, 2022

Ah, interesting, great to know.
Did you have a chance to link repo together and build both client & server parts?
If you have corresponding client & server PRs, can you please reference them in description of this PR? I think I saw client PR at some point, but not server side (and I think changes will be required in both).
As long as we have full plan figured out, I have no concerns :)

@NicholasCouri
Copy link
Contributor Author

NicholasCouri commented Mar 23, 2022 via email

Copy link
Contributor

@heliocliu heliocliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI there aren't any merge conflicts, but the version for protocol-definitions did get updated in next so you'll want to merge and build to re-resolve the breaking type stuff

@NicholasCouri NicholasCouri merged commit d8f2847 into microsoft:next Mar 23, 2022
tylerbutler added a commit to tylerbutler/FluidFramework that referenced this pull request Apr 12, 2022
commit 257aad8
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Mon Apr 11 16:26:12 2022 -0700

    Fix wrong comment (microsoft#9836)

    Fixing wrong comment.

commit 9546b65
Author: tyler-cai-microsoft <90650728+tyler-cai-microsoft@users.noreply.github.com>
Date:   Mon Apr 11 15:57:15 2022 -0700

    Run policy-check (microsoft#9828)

    * Run policy-check

commit b1fa908
Author: Henrique Da Silveira <41453887+hedasilv@users.noreply.github.com>
Date:   Mon Apr 11 14:40:09 2022 -0700

    [r11s] Allowing kafka producer's maxBatchSize to be configurable (microsoft#9830)

commit 7a281b8
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Mon Apr 11 14:18:17 2022 -0700

    Improve logging in DeltaScheduler (microsoft#9788)

    * Improve logging in DeltaScheduler

commit d53ff4a
Merge: 2cb3ff1 8f6fb6c
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Apr 11 13:55:08 2022 -0700

    Merge pull request microsoft#9827 from tyler-cai-microsoft/next-to-main

    Next to main

commit 8f6fb6c
Merge: 2cb3ff1 b7eadee
Author: tyler-cai-microsoft <tylercai@microsoft.com>
Date:   Mon Apr 11 13:24:18 2022 -0700

    Merge remote-tracking branch 'upstream/next' into next-to-main

commit b7eadee
Merge: afb5439 03da11a
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Apr 11 13:11:28 2022 -0700

    Merge pull request microsoft#9825 from heliocliu/MainToNext0411

    Integrate main (up to tip) to next

commit 03da11a
Merge: afb5439 2ddabe6
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Apr 11 12:01:43 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext0411

commit 2cb3ff1
Author: Abram Sanderson <Abram.Sanderson@microsoft.com>
Date:   Mon Apr 11 11:59:26 2022 -0700

    Fix inconsistent TreeView iteration (microsoft#9824)

    Co-authored-by: Abram Sanderson <absander@microsoft.com>

commit 2ddabe6
Author: Abram Sanderson <Abram.Sanderson@microsoft.com>
Date:   Mon Apr 11 11:37:10 2022 -0700

    Optimize tree compression/decompression codepaths (microsoft#9823)

    Co-authored-by: Abram Sanderson <absander@microsoft.com>

commit afb5439
Merge: 5252a96 567be5e
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Apr 8 13:47:08 2022 -0700

    Merge pull request microsoft#9803 from heliocliu/MainToNext0408

    Integrate main (up to tip) to next

commit 5252a96
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Fri Apr 8 13:29:36 2022 -0700

    Fix common utils and definitions versions (microsoft#9797)

    Fix up the versions to match the current versioning scheme

commit 567be5e
Merge: f1b44c3 f2b2dc6
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Apr 8 13:21:19 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext0408

commit d72a754
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Fri Apr 8 13:18:11 2022 -0700

    Bump core-interfaces and container-definitions in client (microsoft#9794)

    This change brings in the latest version of core-interface and container-definitions, and does a bit of cleanup around some FluidObject type usages now that we have the latest types.

commit f1b44c3
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Fri Apr 8 10:41:28 2022 -0700

    Allow FluidObject to be used as object builder (microsoft#9790)

    In the fix for microsoft#8294 I made the properties of FluidObject readonly. This makes building and composition scenarios harder, and was an unintended breaking change. This removes the readonly on property and adds test. If someone wishes to have a readonly FluidObject, they can use the Readonly helper type

commit c9b608e
Merge: cb4daaa e61840a
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Apr 8 09:43:13 2022 -0700

    Merge pull request microsoft#9786 from heliocliu/MainToNext0407

    Integrate main (up to tip) to next

commit cb4daaa
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Fri Apr 8 09:23:55 2022 -0700

    Remove Remaining IFluidObject References (microsoft#9784)
    IFluidObject is no longer part of the type of IFluidHandle and requestFluidObject generic's default.

    ``` diff
    - IFluidHandle<T = IFluidObject & FluidObject & IFluidLoadable>
    + IFluidHandle<T = FluidObject & IFluidLoadable>

    - export function requestFluidObject<T = IFluidObject & FluidObject>(router: IFluidRouter, url: string | IRequest): Promise<T>;
    + export function requestFluidObject<T = FluidObject>(router: IFluidRouter, url: string | IRequest): Promise<T>;
    ```

    This will affect the result of all `get()` calls on IFluidHandle's, and the default return will no longer be and IFluidObject by default.

    Similarly `requestFluidObject` default generic which is also its return type no longer contains IFluidObject.

    In both cases the generic's default is still an [FluidObject](#Deprecate-IFluidObject-and-introduce-FluidObject) which should be used instead.

    As a short term fix in both these cases IFluidObject can be passed at the generic type. However, IFluidObject is deprecated and will be removed in an upcoming release so this can only be a temporary workaround before moving to [FluidObject](#Deprecate-IFluidObject-and-introduce-FluidObject).
    LazyLoadedDataObjectFactory.create no longer returns an IFluidObject, it now only returns a [FluidObject](#Deprecate-IFluidObject-and-introduce-FluidObject).

    As a short term fix the return type of this method can be safely casted to an IFluidObject. However, IFluidObject is deprecated and will be removed in an upcoming release so this can only be a temporary workaround before moving to [FluidObject](#Deprecate-IFluidObject-and-introduce-FluidObject).

    related microsoft#8077

commit 2f0d4ab
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Fri Apr 8 08:48:55 2022 -0700

    Remove IFluidObject from IContainerRuntime.scope type (microsoft#9783)

    Scope is no longer an IFluidObject
    IFluidObject is no longer part of the type of IContainerContext.scope or IContainerRuntime.scope.
    Scope is still an FluidObject which should be used instead.

    fixes microsoft#8941

commit e61840a
Merge: 55f246e 9031425
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Apr 7 17:52:09 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext0407

commit 55f246e
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Thu Apr 7 15:39:00 2022 -0700

    Remove IFluidObject from Default IFluidHandle Generic (microsoft#9780)

    IFluidObject is no longer part of the type of IFluidHandle generic's default.

    ``` diff
    - IFluidHandle<T = IFluidObject & FluidObject & IFluidLoadable>
    + IFluidHandle<T = FluidObject & IFluidLoadable>
    ```

    This will affect the result of all `get()` calls on IFluidHandle's, and the default return will no longer be and IFluidObject by default. IFluidHandle generic's default is still an [FluidObject](https://github.com/microsoft/FluidFramework/blob/main/BREAKING.md#Deprecate-IFluidObject-and-introduce-FluidObject) which should be used instead.

    fixes microsoft#8940

commit 3d97de9
Merge: 6eb58ae 16a42c3
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Apr 7 11:18:07 2022 -0700

    Merge pull request microsoft#9771 from heliocliu/MainToNext0406b

    Integrate main (up to tip) to next

commit 16a42c3
Merge: 399a0db 6eb58ae
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Apr 7 10:45:50 2022 -0700

    Merge branch 'next' into MainToNext0406b

commit 6eb58ae
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Thu Apr 7 09:14:29 2022 -0700

    Remove IFluidObject from IContainerContext scope (microsoft#9772)

    IFluidObject is no longer part of the type of IContainerContext.scope. IContainerContext.scope is still an FluidObject which should be used instead.

    fixes microsoft#8941

commit 399a0db
Merge: 67cf6a2 b984fc4
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Apr 7 00:06:56 2022 -0700

    Merge branch 'next' into MainToNext0406b

commit 67cf6a2
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 23:57:47 2022 -0700

    Fix non-merge issues resulting from merging main to next

    Resolve some package.json versions to match next
    Fix typetest errors
    Resolve build breaks in app-integration-schema-upgrade due to changes in next

commit 3a98079
Merge: a763e40 ce39d61
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 16:31:04 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext0406b

commit b984fc4
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Wed Apr 6 16:27:33 2022 -0700

    Remove IFluidObject from IFluidModule.fluidExport (microsoft#9769)

    IFluidObject is no longer part of the type of IFluidModule.fluidExport. IFluidModule.fluidExport is still a FluidObject which should be used instead.

    Additionally, i've moved IFluidModule to the version of IProvideFluidCodeDetailsComparer in container definitions. These interfaces are equivalent, so not breaking.

commit a763e40
Merge: 3b3ac4e f94a454
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 16:22:53 2022 -0700

    Merge pull request microsoft#9763 from heliocliu/MainToNext0406a

    Integrate main to next up to 6689c64

commit f94a454
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 15:57:39 2022 -0700

    Resolve merge issues in FI

commit 3b3ac4e
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Wed Apr 6 15:16:53 2022 -0700

    Update core-interfaces in client packages (microsoft#9767)

commit 1a72901
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 14:36:40 2022 -0700

    Resolve merge issues in FI

commit 3498db5
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Wed Apr 6 14:28:18 2022 -0700

    Bump core-interfaces version in container and driver definitions (microsoft#9765)

    * Bump core-interfaces version in container and driver definitions

commit fd77cb0
Merge: fc3e0e0 6689c64
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 12:13:47 2022 -0700

    Merge branch 'main6689c6467e' into MainToNext0406a

commit fc3e0e0
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Wed Apr 6 10:01:47 2022 -0700

    Fix core-interfaces version before bump (microsoft#9750)

    * Fix core-interfaces version before bump

    * fix typeValidation version

commit 6866e85
Merge: dbb95bf 8a06318
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Apr 6 09:49:46 2022 -0700

    Merge pull request microsoft#9755 from heliocliu/MainToNext0401a

    Integrate main to next up to the type validator changes (again)

commit dbb95bf
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Tue Apr 5 22:10:29 2022 -0700

    Integrate main to next up to the type validator changes (microsoft#9751)

    * Type Validation Tool Improvements (microsoft#9674)

    Make core type validation logic async to support parallelism on io, and make main loop parrallel
    Improve error handling in core type validation logic
    Enable loading from packages without source (from .d.ts) as we strip source from some packages, like aqueduct
    Improve type handling, specifically add TypeOnly utility the recursively turns all types into typescript types, otherwise we hit problems with privates on classes.
    Switch to single back compat test (Previous). The old format was overkill. In this new way every version will validation only it's previous, which will create a chain of validations between all versions. We have functional e2e test that validate back compat requirements which are runtime, not compile time.
    To see changes in action look at microsoft#9673

    * Add stress test for testing new fluid binary wire format (microsoft#9391)

    * Disbale batching test (microsoft#9678)

    * Fixing runWithRetry with abort signal when container closes (microsoft#9195)

    * Reenable unbound method lint rule and preemptive fixes (microsoft#9689)

    * [GitRest] Refactoring APIs to support storage name header (microsoft#9672)

    * [GitRest] Refactoring APIs to support storage name header

    * Addressing comments

    * [r11s] Allowing getOrCreateRepo to handle headers (microsoft#9691)

    * Enable type validation for all client packages (microsoft#9673)

    This change uses a new improved version of the type validation tool to generate validation tests for all packages (microsoft#9674).

    Generally this change in all done via automation, but there are a couple other changes.

    Remove type validation from existing packages, and move to new model
    Fix fluid-build non-conformant packages
    All automatic type validation generation is removed. It is to slow to run on every build. It should only need to be run after release, and in the presence of new breaking changes that must be suppressed

    * Fix type validator issues

    * Additional type validator fixes

    Co-authored-by: Tony Murphy <anthony.murphy@microsoft.com>
    Co-authored-by: Jatin Garg <48029724+jatgarg@users.noreply.github.com>
    Co-authored-by: chensixx <34214774+chensixx@users.noreply.github.com>
    Co-authored-by: Matt Rakow <ChumpChief@users.noreply.github.com>
    Co-authored-by: Henrique Da Silveira <41453887+hedasilv@users.noreply.github.com>

commit 8a06318
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Tue Apr 5 21:46:36 2022 -0700

    Additional type validator fixes

commit 2cf4716
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Tue Apr 5 16:47:15 2022 -0700

    Fix type validator issues

commit 64afd91
Author: sdeshpande3 <46719950+sdeshpande3@users.noreply.github.com>
Date:   Tue Apr 5 11:34:44 2022 -0700

    Replace ICodeLoader with ICodeDetailsLoader (microsoft#9697)

    The usage of ICodeLoader is replaced with ICodeDetailsLoader in the entire repo. The old interface is not yet removed.

commit 28a35c5
Merge: 6783a8e 5681a58
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Apr 1 14:08:35 2022 -0700

    Merge branch 'main5681a5854c' into MainToNext0401a

commit 6783a8e
Author: sdeshpande3 <46719950+sdeshpande3@users.noreply.github.com>
Date:   Thu Mar 31 10:09:13 2022 -0700

    Import fluidPackage from container-definitions (microsoft#9653)

commit 7fb8d15
Author: sdeshpande3 <46719950+sdeshpande3@users.noreply.github.com>
Date:   Wed Mar 30 19:24:19 2022 -0700

    Remove raiseContainerWarning from IContainerContext in next branch (microsoft#9681)

commit 05e6ed5
Merge: 56d7a02 2b2f75f
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 30 13:25:50 2022 -0700

    Merge pull request microsoft#9676 from heliocliu/MainToNext330

    Integrate main to next

commit 2b2f75f
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 30 12:18:10 2022 -0700

    correct bad merge to pond/package.json

commit 268cdf6
Merge: 56d7a02 2852a85
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 30 11:57:44 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext330

commit 56d7a02
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Tue Mar 29 19:16:24 2022 -0700

    Final client changes for TreeEntry.Commit and ISnapshotTree.commits removal (microsoft#9633)

    * Final changes for TreeEntry.Commit removal

commit 2b13c61
Merge: bc1f3da 67208ee
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Mar 28 14:35:26 2022 -0700

    Merge pull request microsoft#9643 from heliocliu/MainToNext328

    Integrate main to next

commit 67208ee
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Mar 28 14:02:23 2022 -0700

    Fix type tests for driver-definitions

commit 64c4986
Merge: bc1f3da 3f0ac3f
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Mon Mar 28 12:14:17 2022 -0700

    Merge remote-tracking branch 'upstream/main' into MainToNext328

commit bc1f3da
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Fri Mar 25 18:08:37 2022 -0700

    Initial Server Changes after TreeEntry.Commit was removed (microsoft#9614)

    * Initial Server changes after TreeEntry.Commit
    got removed

commit a20fa19
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Fri Mar 25 15:10:10 2022 -0700

    Bump version from driver-definitions (microsoft#9620)

commit 3c27cac
Merge: e36448b 8a99530
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Mar 25 10:28:21 2022 -0700

    Integrate main up to d081771 to next (microsoft#9609)

    Integrate main up to d081771 to next

commit 8a99530
Merge: e36448b d081771
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 24 16:56:16 2022 -0700

    Merge branch 'main_d081771' into MainToNext324

commit e36448b
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Thu Mar 24 15:57:13 2022 -0700

    Bumping dependency on protocol-definitions (microsoft#9603)

commit bef891f
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Thu Mar 24 13:48:03 2022 -0700

    Next: Fix Type Validation (microsoft#9584)

    * Next: Fix Type Validation

commit 2c174af
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Thu Mar 24 12:30:36 2022 -0700

    Driver-Definitions - Updating the protocol-definitions version  (microsoft#9579)

    *Driver-Definitions: Bump the dependency from protocol-definitions

commit feea8d2
Merge: d8f2847 088e5ea
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 24 00:45:32 2022 -0700

    Merge pull request microsoft#9570 from heliocliu/MainToNext1

    FI main to next up until commit cc3b7e4

commit 088e5ea
Merge: 8b5d0a1 cc3b7e4
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 23 16:28:33 2022 -0700

    Merge commit cc3b7e4

commit 8b5d0a1
Merge: d8f2847 be9e056
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 23 16:24:39 2022 -0700

    Merge branch 'MainNextMerge1' into MainToNext1

commit d8f2847
Author: NicholasCouri <nichoc@microsoft.com>
Date:   Wed Mar 23 11:49:48 2022 -0700

    Removal of TreeEntry.Commit and ISnapshotTree.commit (microsoft#9520)

    * Removal of TreeEntry.Commit and ISnapshotTree.commits from protocol-definitions

commit 8ff6805
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 17 17:53:20 2022 -0700

    Bump released package versions for next branch (microsoft#9526)

    These did not get bumped previously when 0.58 initially released from main.

                @fluidframework/build-common:     0.24.0 (unchanged)
         @fluidframework/eslint-config-fluid:  0.27.2000 -> 0.28.1000
          @fluidframework/common-definitions:     0.21.0 (unchanged)
                @fluidframework/common-utils:     0.33.0 (unchanged)
             @fluidframework/core-interfaces:     0.43.0 (unchanged)
        @fluidframework/protocol-definitions: 0.1027.2000 -> 0.1028.1000
          @fluidframework/driver-definitions:  0.45.2000 -> 0.46.1000
       @fluidframework/container-definitions:  0.47.2000 -> 0.48.1000
                                      Server: 0.1035.2000 -> 0.1036.1000
                                      Client:  0.58.2000 -> 0.59.1000

commit 6cc3ff5
Merge: 12321b2 0205f1f
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 17 16:22:31 2022 -0700

    Merge pull request microsoft#9519 from heliocliu/MainToNext

    Bringing over the commit history from the previous integrate because I messed up by doing a squishy merge instead of a normal merge

commit 0205f1f
Merge: 12321b2 cd477a2
Author: heliocliu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 17 14:54:09 2022 -0700

    Merge branch 'MainToNext' of https://github.com/heliocliu/FluidFramework-1 into MainToNext

commit 12321b2
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 16 17:52:44 2022 -0700

    FI main to next (microsoft#9515)

    * Move internal implementation of the odsp driver cache to the Fluid Framework Repository (microsoft#9418)

    * initial commit

    * Update tsconfigs

    * Compile fixes

    * Make tests pass

    * Add readme

    * Update formatting

    * Some eslint suppressions and fixes

    * Fix formatting lint issues

    * Disable some lint rules

    * More disables

    * Fix last of eslint issues

    * Policy check fixes

    * Policy update

    * Pin url-parse types

    * Add comments

    * Undo lerna package changes

    * Update lockfile

    * Undo content changes

    * Undo content changes

    * Undo content

    * Remove deprecated API

    * Rename folder

    * Autogenerated files

    * Remove more internal references

    * Update packages/drivers/driver-web-cache/package.json

    Co-authored-by: Helio Liu <59622401+heliocliu@users.noreply.github.com>

    * Update packages/drivers/driver-web-cache/package.json

    Co-authored-by: Helio Liu <59622401+heliocliu@users.noreply.github.com>

    * Minor cleanups

    Co-authored-by: Helio Liu <59622401+heliocliu@users.noreply.github.com>

    * Update bump-version tool to use 1 indexing for virtual patch (microsoft#9459)

    Update the bump-version tooling to use 1 indexing for the minor component when bumping the major component for virtual patches. This preserves 4 digits for the last version component (that holds minor and patch information) for all versions, and skips over the x.x.0 version. This avoids confusion around x.x.1 and x.x.1000 due to the differences in number of digits. 0 padding is not an option because it is not considered valid semver.

    * Update BREAKING.md format to include upcoming change notes (microsoft#9457)

    Update the formatting for 0.58 section and the instructions to include upcoming change notes. This is to be more explicit about upcoming breaking changes to help consumers with planning them, because currently they tend to get lost with the other breaking entries. This is also to help build habits around announcing upcoming breaking changes instead of dumping them on consumers only when they actually break.

    * Update tinylicious and gitrest, and use release packages everywhere (microsoft#9473)

    * Use strict eslint config in fluid-framework (microsoft#9476)

    * Add recursive firing of dispose events of sub directory deletion (microsoft#9451)

    * Remove outdated socket.io client types package (microsoft#9479)

    * Fixes the FlushMode validation in PendingStateManager which expected Immediate to be the default FlushMode (microsoft#9432)

    * Organize and document summarizer telemetry (microsoft#9278)

    Add typing and comments for fields logged in summarizer telemetry. Fix a double increment of RunningSummarizer.totalSuccessfulAttempts.

    * Bump eslint version for main, and bump used versions of eslint after release (microsoft#9493)

    * Update to latest tinylicious throughout repo (microsoft#9494)

    * gitrest: pre-compute latest summary for Historian caching (microsoft#9490)

    * gitrest: add FS Manager interface (microsoft#9496)

    * r11s-driver: handle node-fetch network errors (microsoft#9498)

    * Remove GC from odspCache implementation. (microsoft#9415)

    * Remove GC from odspCache implementation by using a local Expiration cache with a single entry per
    documentId. Also, taking the chance to remove 2 secs timeouts from the UTs and start relying on the cleanup at the end of the test to remove the cache entries just like the actual implementation that implements from the EpochTracker does.

    * Pass ISequencedDocumentMessage to interval creation API (microsoft#9465)

    Pass msg to interval creation API so we attach to the correct text segment on remote op

    * Remove duplicate nesting of server packages from lerna-package-lock.json (microsoft#9507)

    Co-authored-by: Christian Gonzalez <1581488+christiango@users.noreply.github.com>
    Co-authored-by: Matt Rakow <ChumpChief@users.noreply.github.com>
    Co-authored-by: Tyler Butler <tyler@tylerbutler.com>
    Co-authored-by: Jatin Garg <48029724+jatgarg@users.noreply.github.com>
    Co-authored-by: Navin Agarwal <45832642+agarwal-navin@users.noreply.github.com>
    Co-authored-by: Paul Leathers <pleath@users.noreply.github.com>
    Co-authored-by: Zach Newton <znewton@microsoft.com>
    Co-authored-by: NicholasCouri <nichoc@microsoft.com>

commit 81f8efe
Merge: 8e2993c 10dd607
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Mar 11 16:36:24 2022 -0800

    Merge pull request microsoft#9454 from heliocliu/MainToNext

    Note: You'll see in this PR that it's bringing over all the package versions changes from main when it got bumped to 0.58.2000. This will be resolved later because next has not been bumped to 0.59.1000 yet. In the future, any similar package version changes from main should be discarded in the merge resolution.

commit 8e2993c
Merge: 85b2ff6 fb61046
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Mar 11 12:29:10 2022 -0800

    Merge pull request microsoft#9448 from heliocliu/MainToNext

    Integrate main to next

commit fb61046
Merge: f8566fc 85b2ff6
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Thu Mar 10 18:11:22 2022 -0800

    Merge branch 'next' into MainToNext

commit 85b2ff6
Author: Paul Leathers <pleath@users.noreply.github.com>
Date:   Thu Mar 10 17:42:09 2022 -0800

    Emit an event on IntervalCollection creation (microsoft#9384)

    Let SharedSegmentSequence emit an event on IntervalCollection creation and let the IntervalCollection labels in a given SharedSegmentSequence be enumerated

commit 9287bb2
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Wed Mar 9 11:06:10 2022 -0800

    Integrate main to next (microsoft#9408)

    * Run static web app deployment in linux, and guardian tasks in windows (microsoft#9386)

    * Integrate latest prerelease of eslint-config-fluid throughout the repo and fix up errors (microsoft#9389)

    * Support string parserOptions.project in eslint configuration (microsoft#9392)

    * Handle errors in docs pipeline more gracefully (microsoft#9393)

    * Fixing some error logging race conditions for the root datastore end-to-end tests (microsoft#9387)

    it's disabling the summarizer, which either runs or not, depending on how long the test takes.

    * Remove duplicate implementation from toInstrumentedOdspTokenFetcher (toInstrumentedTokenFetcher) (microsoft#9375)

    * Remove duplicate toInstrumentedTokenFetcher implementation (duplicate from toInstrumentedOdspTokenFetcher )

    * MergeTree: Add stress for LocalReferences (microsoft#9340)

    This change leverages the existing stress infra in merge tree, we call them farms as in bug farm as they find lots of bugs. This is in preparation for how we do local reference sliding.

    related to microsoft#1008

    * Fix lint issues

    * Missed one

    Co-authored-by: Tyler Butler <tyler@tylerbutler.com>
    Co-authored-by: Matt Rakow <ChumpChief@users.noreply.github.com>
    Co-authored-by: Andrei Iacob <84357545+andre4i@users.noreply.github.com>
    Co-authored-by: NicholasCouri <nichoc@microsoft.com>
    Co-authored-by: Tony Murphy <anthony.murphy@microsoft.com>
    Co-authored-by: Matt Rakow <marakow@microsoft.com>

commit 0d98514
Author: Tony Murphy <anthony.murphy@microsoft.com>
Date:   Tue Mar 8 15:54:21 2022 -0800

    MergeTree: Unify removed client id and overlap clients (microsoft#9369)

    This change unifies the removedClientId and removedClientOverlap into a single array, removedClientIds.

    This simplifies our handling in a number of places, as we no longer need to check and manage both. In fact, there were a couple bugs where both were not handled appropriately.

    In addition, I've improved how we handle IRemovalInfo such that it is now all or nothing, which removes the need for a number of unsafe non-null assertions, and make the code simpler by removing the need to repeated non-null checks.

    this may fix microsoft#9138, but it hard to know as we don't have much telemetry around the issue.

commit c9bcf58
Merge: 9257743 36a6474
Author: Helio Liu <59622401+heliocliu@users.noreply.github.com>
Date:   Fri Mar 4 18:44:49 2022 -0800

    Merge pull request microsoft#9379 from microsoft/main

    Merge "main" into "next" in prep for "next" version bump
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking change This PR or issue would introduce a breaking change public api change Changes to a public API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants