Apply GCPair to TreeNode

yorkie-team · May 17, 2024 · 80c614c · 80c614c
1 parent bd46419
commit 80c614c
Show file tree

Hide file tree

Showing 12 changed files with 424 additions and 377 deletions.
diff --git a/api/converter/from_pb.go b/api/converter/from_pb.go
@@ -658,10 +658,11 @@ func fromTreeNode(pbNode *api.TreeNode) (*crdt.TreeNode, error) {
 		}
 	}
 
-	node.RemovedAt, err = fromTimeTicket(pbNode.RemovedAt)
+	removedAt, err := fromTimeTicket(pbNode.RemovedAt)
 	if err != nil {
 		return nil, err
 	}
+	node.SetRemovedAt(removedAt)
 
 	return node, nil
 }

diff --git a/api/converter/to_bytes.go b/api/converter/to_bytes.go
@@ -310,10 +310,10 @@ func toTreeNode(treeNode *crdt.TreeNode, depth int) *api.TreeNode {
 	}
 
 	pbNode := &api.TreeNode{
-		Id:         toTreeNodeID(treeNode.ID),
+		Id:         toTreeNodeID(treeNode.ID()),
 		Type:       treeNode.Type(),
 		Value:      treeNode.Value,
-		RemovedAt:  ToTimeTicket(treeNode.RemovedAt),
+		RemovedAt:  ToTimeTicket(treeNode.RemovedAt()),
 		Depth:      int32(depth),
 		Attributes: attrs,
 	}

diff --git a/pkg/document/crdt/gc.go b/pkg/document/crdt/gc.go
@@ -32,6 +32,6 @@ type GCParent interface {
 
 // GCChild is an interface for the child of the garbage collection target.
 type GCChild interface {
-	ID() string
+	IDString() string
 	RemovedAt() *time.Ticket
 }
diff --git a/pkg/document/crdt/rht.go b/pkg/document/crdt/rht.go
@@ -42,7 +42,7 @@ func newRHTNode(key, val string, updatedAt *time.Ticket, isRemoved bool) *RHTNod
 }
 
 // ID returns the ID of this node.
-func (n *RHTNode) ID() string {
+func (n *RHTNode) IDString() string {
 	return n.updatedAt.Key() + ":" + n.key
 }
 
@@ -231,7 +231,7 @@ func (rht *RHT) Marshal() string {
 
 // Purge purges the given child node.
 func (rht *RHT) Purge(child *RHTNode) error {
-	if node, ok := rht.nodeMapByKey[child.key]; !ok || node.ID() != child.ID() {
+	if node, ok := rht.nodeMapByKey[child.key]; !ok || node.IDString() != child.IDString() {
 		//return ErrChildNotFound
 		return nil
 	}

diff --git a/pkg/document/crdt/root.go b/pkg/document/crdt/root.go
@@ -171,7 +171,7 @@ func (r *Root) GarbageCollect(ticket *time.Ticket) (int, error) {
 				return 0, err
 			}
 
-			delete(r.gcPairMapByID, pair.Child.ID())
+			delete(r.gcPairMapByID, pair.Child.IDString())
 			count++
 		}
 	}
@@ -219,10 +219,10 @@ func (r *Root) GarbageLen() int {
 
 // RegisterGCPair registers the given pair to hash table.
 func (r *Root) RegisterGCPair(pair GCPair) {
-	if _, ok := r.gcPairMapByID[pair.Child.ID()]; ok {
-		delete(r.gcPairMapByID, pair.Child.ID())
+	if _, ok := r.gcPairMapByID[pair.Child.IDString()]; ok {
+		delete(r.gcPairMapByID, pair.Child.IDString())
 		return
 	}
 
-	r.gcPairMapByID[pair.Child.ID()] = pair
+	r.gcPairMapByID[pair.Child.IDString()] = pair
 }