Skip to content

Commit

Permalink
Revert "dummy commit" (#143)
Browse files Browse the repository at this point in the history 
This reverts commit 87fa223. (+10 squashed commits)
Squashed commits:
[87fa223] dummy commit
[b14b4b2] added missing assertEqual
[65354db] remove consecutive spaces
[997aedd] swiftline error fix2
[2851987] swiftlint error fix
[c2007db] fix trailing whitespace error: CRDTRoot
[9a97314] fix trailing whitespace error
[003992a] fix trailing whitespace error
[03af2d4] remove unnecessary structure declaration
[79f4e75] Fix getGarbageLen to retrun correct size

Co-authored-by: kim.minwoo <>
  • Loading branch information
@myupage
myupage authored Jan 18, 2024
1 parent ec8868f commit 325d67f
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 12 deletions.
11 changes: 7 additions & 4 deletions Sources/Document/CRDT/CRDTRoot.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,21 +155,24 @@ class CRDTRoot {
*/
var garbageLength: Int {
var count = 0
var seen = Set<String>()

self.removedElementSetByCreatedAt.forEach {
count += 1
seen.insert($0)

guard let pair = self.elementPairMapByCreatedAt[$0],
let element = pair.element as? CRDTContainer
else {
return
}

element.getDescendants { _, _ in
count += 1
element.getDescendants { element, _ in
seen.insert(element.createdAt.toIDString)
return false
}
}

count += seen.count

self.elementHasRemovedNodesSetByCreatedAt.forEach {
guard let pair = self.elementPairMapByCreatedAt[$0],
let element = pair.element as? CRDTGCElement
Expand Down
60 changes: 60 additions & 0 deletions Tests/Integration/GCTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,66 @@ class GCTests: XCTestCase {
XCTAssertEqual(root, clone)
}

func test_getGarbageLength_should_return_the_actual_number_of_elements_garbage_collected() async throws {
let options = ClientOptions()
let docKey = "\(self.description)-\(Date().description)".toDocKey

let doc1 = Document(key: docKey)
let doc2 = Document(key: docKey)

let client1 = Client(rpcAddress: rpcAddress, options: options)
let client2 = Client(rpcAddress: rpcAddress, options: options)

try await client1.activate()
try await client2.activate()

// 1. initial state
try await client1.attach(doc1, [:], false)

try await doc1.update { root, _ in
root.point = ["x": Int64(0), "y": Int64(0)]
}

try await client1.sync()
try await client2.attach(doc2, [:], false)

// 2. client1 updates doc
try await doc1.update { root, _ in
root.remove(key: "point")
}

var len = await doc1.getGarbageLength()
XCTAssertEqual(len, 3)

// 3. client2 updates doc
try await doc2.update { root, _ in
(root.point as? JSONObject)?.remove(key: "x")
}

len = await doc2.getGarbageLength()
XCTAssertEqual(len, 1) // x

try await client1.sync()
try await client2.sync()
try await client1.sync()

let gcNodeLen = 3 // point x, y
var doc1Len = await doc1.getGarbageLength()
var doc2Len = await doc2.getGarbageLength()
XCTAssertEqual(doc1Len, gcNodeLen)
XCTAssertEqual(doc2Len, gcNodeLen)

// Actual garbage-collected nodes
doc1Len = await doc1.garbageCollect(lessThanOrEqualTo: TimeTicket.max)
doc2Len = await doc2.garbageCollect(lessThanOrEqualTo: TimeTicket.max)

XCTAssertEqual(doc1Len, gcNodeLen)
XCTAssertEqual(doc2Len, gcNodeLen)

try await client1.deactivate()
try await client2.deactivate()
}

func test_text_garbage_collection_test() async throws {
let doc = Document(key: "test-doc")

Expand Down
8 changes: 0 additions & 8 deletions Yorkie.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@
CE8ED32128F646EA009A5419 /* AddOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8ED32028F646EA009A5419 /* AddOperation.swift */; };
CE8ED32728F6470D009A5419 /* MoveOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8ED32628F6470D009A5419 /* MoveOperation.swift */; };
CE9557C02902025600DF4DFA /* JSONObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9557BE2902024700DF4DFA /* JSONObjectTests.swift */; };
CE9557C8290666CE00DF4DFA /* Trie.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9557C7290666CE00DF4DFA /* Trie.swift */; };
CE9557CB29066D8C00DF4DFA /* TrieTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9557C929066D8700DF4DFA /* TrieTests.swift */; };
CE9557CD2907523A00DF4DFA /* JSONArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9557CC2907523A00DF4DFA /* JSONArray.swift */; };
CE9557CF2908B6BA00DF4DFA /* JSONDatable.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9557CE2908B6BA00DF4DFA /* JSONDatable.swift */; };
CE9F6FAE2910FBBA002F776D /* DocumentConcurrentAccessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9F6FAD2910FBBA002F776D /* DocumentConcurrentAccessTests.swift */; };
Expand Down Expand Up @@ -228,8 +226,6 @@
CE8ED32028F646EA009A5419 /* AddOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddOperation.swift; sourceTree = "<group>"; };
CE8ED32628F6470D009A5419 /* MoveOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoveOperation.swift; sourceTree = "<group>"; };
CE9557BE2902024700DF4DFA /* JSONObjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONObjectTests.swift; sourceTree = "<group>"; };
CE9557C7290666CE00DF4DFA /* Trie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Trie.swift; sourceTree = "<group>"; };
CE9557C929066D8700DF4DFA /* TrieTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrieTests.swift; sourceTree = "<group>"; };
CE9557CC2907523A00DF4DFA /* JSONArray.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONArray.swift; sourceTree = "<group>"; };
CE9557CE2908B6BA00DF4DFA /* JSONDatable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONDatable.swift; sourceTree = "<group>"; };
CE9F6FAD2910FBBA002F776D /* DocumentConcurrentAccessTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentConcurrentAccessTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -400,7 +396,6 @@
CE3EC95028D195E0009471BC /* LLRBTreeTests.swift */,
CE3EC95D28D2AA9C009471BC /* SplayTreeTests.swift */,
CEA2DA4B28F693F500431B61 /* StringExtensionsTests.swift */,
CE9557C929066D8700DF4DFA /* TrieTests.swift */,
9AB6744C2A525BA800EBD282 /* IndexTreeTests.swift */,
);
path = Util;
Expand Down Expand Up @@ -515,7 +510,6 @@
CE7B996D28E142A300D56198 /* Errors.swift */,
CE72E85128EE531C00D1331C /* Collection+Extensions.swift */,
CEA2DA4928F6938700431B61 /* String+Extensions.swift */,
CE9557C7290666CE00DF4DFA /* Trie.swift */,
CEF64379290A4F0B00C32B99 /* Optional+Extensions.swift */,
9A7E88BF2A4962A700AF8997 /* IndexTree.swift */,
9A232B762A7D0C0F0041C826 /* Dictionary+Extension.swift */,
Expand Down Expand Up @@ -850,7 +844,6 @@
9A66B1A02955833E00D10B94 /* LLRBTree.swift in Sources */,
CEFF0015290120000020561A /* JSONObject.swift in Sources */,
CEC631D728EFFE6A00915A85 /* CRDTRoot.swift in Sources */,
CE9557C8290666CE00DF4DFA /* Trie.swift in Sources */,
CE7B997428E1766F00D56198 /* Converter.swift in Sources */,
9ADAEE5829657696007E9F9F /* JSONText.swift in Sources */,
CE8C22F728C9E89100432DE5 /* TimeTicket.swift in Sources */,
Expand Down Expand Up @@ -900,7 +893,6 @@
9AFB4EBC2A93980A00494401 /* Dictionary+Extension.swift in Sources */,
9A93DB6B2A67DBE000A0F449 /* IntegrationHelper.swift in Sources */,
9A30D40429514F150036F732 /* ClientTests.swift in Sources */,
CE9557CB29066D8C00DF4DFA /* TrieTests.swift in Sources */,
CEDB32E028EBE6A4004BBA80 /* CRDTObjectTests.swift in Sources */,
CE370E5C28EEBFA6008FCABD /* RHTTests.swift in Sources */,
CE8BB73828FE28410020F62A /* ChangeTests.swift in Sources */,
Expand Down

0 comments on commit 325d67f

Please sign in to comment.