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

Respect interval start & end side on ack #22945

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

Abe27342
Copy link
Contributor

@Abe27342 Abe27342 commented Oct 30, 2024

Description

Users of IntervalCollection can specify a start and end side when adding or changing an interval. Doing so changes the behavior for the resulting start and end local references put into the merge tree: using the default Side.Before causes references to slide forward when the segment they exist on is removed, whereas using Side.After causes references to slide backward.

In the common case, local reference positions sliding is initiated by removing a segment in merge-tree. However, IntervalCollection also reuses this slide logic when intervals are changed/added concurrently to a segment removal. This latter case did not correctly plumb through the sliding preference to the helper function it used, which gave undesirable merge semantics.

Resolves AB#22191.

@Abe27342 Abe27342 requested a review from a team as a code owner October 30, 2024 23:02
@github-actions github-actions bot added area: dds Issues related to distributed data structures area: dds: sharedstring base: main PRs targeted against main branch labels Oct 30, 2024
Copy link
Collaborator

@msfluid-bot msfluid-bot left a comment

Choose a reason for hiding this comment

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

Code Coverage Summary

↑ packages.dds.sequence.src:
Line Coverage Change: 0.01%    Branch Coverage Change: No change
Metric NameBaseline coveragePR coverageCoverage Diff
Branch Coverage 89.47% 89.47% → No change
Line Coverage 89.74% 89.75% ↑ 0.01%

Baseline commit: 522f76f
Baseline build: 303346
Happy Coding!!

Code coverage comparison check passed!!

@msfluid-bot
Copy link
Collaborator

@fluid-example/bundle-size-tests: +297 Bytes
Metric NameBaseline SizeCompare SizeSize Diff
aqueduct.js 464.62 KB 464.68 KB +61 Bytes
azureClient.js 562.79 KB 562.83 KB +49 Bytes
connectionState.js 724 Bytes 724 Bytes No change
containerRuntime.js 262.21 KB 262.22 KB +14 Bytes
fluidFramework.js 406.75 KB 406.77 KB +14 Bytes
loader.js 134.17 KB 134.18 KB +14 Bytes
map.js 42.71 KB 42.71 KB +7 Bytes
matrix.js 148.54 KB 148.54 KB +7 Bytes
odspClient.js 528.73 KB 528.78 KB +49 Bytes
odspDriver.js 97.84 KB 97.86 KB +21 Bytes
odspPrefetchSnapshot.js 42.81 KB 42.82 KB +14 Bytes
sharedString.js 164.73 KB 164.76 KB +33 Bytes
sharedTree.js 397.21 KB 397.22 KB +7 Bytes
Total Size 3.33 MB 3.33 MB +297 Bytes

Baseline commit: 522f76f

Generated by 🚫 dangerJS against 8e187b5

@Abe27342 Abe27342 merged commit 929f766 into microsoft:main Oct 31, 2024
33 checks passed
@Abe27342 Abe27342 deleted the respect-slide-preference branch October 31, 2024 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: dds: sharedstring area: dds Issues related to distributed data structures base: main PRs targeted against main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants