Skip to content

Fix CRDT.ORMap serialization/gossip bug #722

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Jul 9, 2020
Merged

Fix CRDT.ORMap serialization/gossip bug #722

merged 3 commits into from
Jul 9, 2020

Conversation

@yim-lee
Copy link
Member

@yim-lee yim-lee commented Jul 8, 2020

Motivation:
See #720

Modifications:
Add defaultValue to ORMap proto so it's included in serialization
and deserialized ORMap would have defaultValue set.

Add test to reproduce error and verify fix.

Result:
No fatal error when gossiping ORMap. Resolves #720

yim-lee added 2 commits July 8, 2020 09:40
@yim-lee
Fix CRDT.ORMap gossip/serialization bug
38b17e9 
Motivation:
See #720

Modifications:
Add `defaultValue` to `ORMap` proto so it's included in serialization
and deserialized `ORMap` would have `defaultValue` set.

Add test to reproduce error and verify fix.

Result:
No fatal error when gossiping `ORMap`. Resolves #720
@yim-lee
Don't use nil
4f715da
@yim-lee
Copy link
Member Author

yim-lee commented Jul 8, 2020

This is #721 without nil fix or error logging tests.

@yim-lee
Copy link
Member Author

yim-lee commented Jul 8, 2020

Created new tickets for some old issues: #723, #724, #725

@yim-lee
Copy link
Member Author

yim-lee commented Jul 8, 2020

#614, #726, #727

The new test is passing in 5.2 with wrapper

@swift-server-bot test this please

@yim-lee
Copy link
Member Author

yim-lee commented Jul 8, 2020

#728, #712

@swift-server-bot test this please

@yim-lee yim-lee requested a review from ktoso July 8, 2020 19:02
@yim-lee yim-lee mentioned this pull request Jul 8, 2020
Closed
ktoso
ktoso reviewed Jul 9, 2020
View reviewed changes
Tests/DistributedActorsTests/CRDT/CRDTGossipReplicationClusteredTests.swift
self.value = value
}
}

Copy link
Member

@ktoso ktoso Jul 9, 2020

Choose a reason for hiding this comment

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

Yeah annoying workaround but way simpler than trying to hack it into working... Thanks @yim-lee

Copy link
Member

@ktoso ktoso Jul 9, 2020

Choose a reason for hiding this comment

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

Foundation should be fixed in 5.2.5 i hope: swiftlang/swift-corelibs-foundation#2840

@ktoso
Copy link
Member

ktoso commented Jul 9, 2020 •
edited
Loading

Thank you @yim-lee!

Do we need to release or can you workaround with the same ValueHolder thing in your work?

@ktoso ktoso merged commit 810710c into apple:master Jul 9, 2020
@ktoso ktoso deleted the ormap-seri-fix-1 branch July 9, 2020 03:23
@yim-lee
Copy link
Member Author

yim-lee commented Jul 9, 2020

Do we need to release or can you workaround with the same ValueHolder thing in your work?

Yep, we need a release for the defaultValue change and I am adding ValueHolder thing to workaround the serialization issue. 🙇🏻‍♀️

@ktoso
Copy link
Member

ktoso commented Jul 9, 2020

Will cut one today then, no problem at all 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ktoso ktoso ktoso left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CRDT.ORMap serialization failure during gossip

2 participants

@yim-lee @ktoso