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.

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

Fix invalid tree style changes #167

Merged
merged 2 commits into from
May 17, 2024
Merged

Fix invalid tree style changes #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efdbb5c
Fix invalid tree style changes
humdrum May 17, 2024
3a78fd1
fix lint error
humdrum May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions Sources/Document/CRDT/CRDTTree.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,6 @@ class CRDTTree: CRDTGCElement {
let (toParent, toLeft) = try self.findNodesAndSplitText(range.1, editedAt)

var changes: [TreeChange] = []
let value = attributes != nil ? TreeChangeValue.attributes(attributes!) : nil
var createdAtMapByActor = [String: TimeTicket]()

try self.traverseInPosRange(fromParent, fromLeft, toParent, toLeft) { token, _ in
Expand All @@ -606,19 +605,30 @@ class CRDTTree: CRDTGCElement {
if node.attrs == nil {
node.attrs = RHT()
}
for (key, value) in attributes ?? [:] {
node.attrs?.set(key: key, value: value, executedAt: editedAt)
var affectedKeys = Set<String>()
for (key, value) in attributes ?? [:] where node.attrs?.set(key: key, value: value, executedAt: editedAt) ?? false {
affectedKeys.insert(key)
}

try changes.append(TreeChange(actor: editedAt.actorID,
type: .style,
from: self.toIndex(fromParent, fromLeft),
to: self.toIndex(toParent, toLeft),
fromPath: self.toPath(fromParent, fromLeft),
toPath: self.toPath(toParent, toLeft),
value: value,
splitLevel: 0) // dummy value.
)
if !affectedKeys.isEmpty {
var affectedAttrs = [String: String]()

for affectedKey in affectedKeys {
if let attr = attributes?[affectedKey] {
affectedAttrs[affectedKey] = attr
}
}

try changes.append(TreeChange(actor: editedAt.actorID,
type: .style,
from: self.toIndex(fromParent, fromLeft),
to: self.toIndex(toParent, toLeft),
fromPath: self.toPath(fromParent, fromLeft),
toPath: self.toPath(toParent, toLeft),
value: TreeChangeValue.attributes(affectedAttrs),
splitLevel: 0) // dummy value.
)
}
}
}

Expand Down
21 changes: 12 additions & 9 deletions Sources/Document/CRDT/RHT.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,22 @@ class RHT {
/**
* `set` sets the value of the given key.
*/
func set(key: String, value: String, executedAt: TimeTicket) {
if let prev = nodeMapByKey[key] {
if executedAt.after(prev.updatedAt) {
if !prev.isRemoved {
self.numberOfRemovedElement -= 1
}
let node = RHTNode(key: key, value: value, updatedAt: executedAt, isRemoved: false)
self.nodeMapByKey[key] = node
@discardableResult
func set(key: String, value: String, executedAt: TimeTicket) -> Bool {
let prev = self.nodeMapByKey[key]

if prev == nil || executedAt.after(prev!.updatedAt) {
if prev != nil && !prev!.isRemoved {
self.numberOfRemovedElement -= 1
}
} else {

let node = RHTNode(key: key, value: value, updatedAt: executedAt, isRemoved: false)
self.nodeMapByKey[key] = node

return true
}

return false
}

/**
Expand Down
46 changes: 46 additions & 0 deletions Tests/Integration/TreeIntegrationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3765,6 +3765,52 @@ final class TreeIntegrationTreeChangeGeneration: XCTestCase {
}
}

func test_concurrent_style_and_style() async throws {
try await withTwoClientsAndDocuments(self.description) { c1, d1, c2, d2 in
try await d1.update { root, _ in
root.t = JSONTree(initialRoot:
JSONTreeElementNode(type: "doc",
children: [
JSONTreeElementNode(type: "p",
children: [
JSONTreeTextNode(value: "hello")
])
])
)
}

try await c1.sync()
try await c2.sync()

var d1XML = await(d1.getRoot().t as? JSONTree)?.toXML()
var d2XML = await(d2.getRoot().t as? JSONTree)?.toXML()
XCTAssertEqual(d1XML, d2XML)
XCTAssertEqual(d1XML, /* html */ "<doc><p>hello</p></doc>")

await subscribeDocs(d1,
d2,
[TreeStyleOpInfoForDebug(from: 0, to: 1, value: ["bold": "true"], fromPath: nil),
TreeStyleOpInfoForDebug(from: 0, to: 1, value: ["bold": "false"], fromPath: nil)],
[TreeStyleOpInfoForDebug(from: 0, to: 1, value: ["bold": "false"], fromPath: nil)])

try await d1.update { root, _ in
try (root.t as? JSONTree)?.style(0, 1, ["bold": "true"])
}
try await d2.update { root, _ in
try (root.t as? JSONTree)?.style(0, 1, ["bold": "false"])
}

try await c1.sync()
try await c2.sync()
try await c1.sync()

d1XML = await(d1.getRoot().t as? JSONTree)?.toXML()
d2XML = await(d2.getRoot().t as? JSONTree)?.toXML()
XCTAssertEqual(d1XML, d2XML)
XCTAssertEqual(d1XML, /* html */ "<doc><p bold=\"false\">hello</p></doc>")
}
}

func test_emoji() async throws {
try await withTwoClientsAndDocuments(self.description) { c1, d1, c2, d2 in
try await d1.update { root, _ in
Expand Down
Loading