Introduce Hybrid vector clock

admin/client.go

@@ -332,6 +332,7 @@ func (c *Client) ListChangeSummaries(
 		seq,
 		snapshotMeta.Msg.Lamport,
 		snapshotMeta.Msg.Snapshot,
+		snapshotMeta.Msg.SyncedVectorMap,
 	)
 
 	if err != nil {

api/converter/from_pb.go

@@ -102,13 +102,19 @@ func FromChangePack(pbPack *api.ChangePack) (*change.Pack, error) {
 		return nil, err
 	}
 
+	syncedVectorMap, err := time.NewSyncedVectorMapFromJSON(pbPack.SyncedVectorMap)
+	if err != nil {
+		return nil, err
+	}
+
 	return &change.Pack{
 		DocumentKey:     key.Key(pbPack.DocumentKey),
 		Checkpoint:      fromCheckpoint(pbPack.Checkpoint),
 		Changes:         changes,
 		Snapshot:        pbPack.Snapshot,
 		MinSyncedTicket: minSyncedTicket,
 		IsRemoved:       pbPack.IsRemoved,
+		SyncedVectorMap: syncedVectorMap,
 	}, nil
 }
 
@@ -136,6 +142,7 @@ func FromChanges(pbChanges []*api.Change) ([]*change.Change, error) {
 			pbChange.Message,
 			ops,
 			FromPresenceChange(pbChange.PresenceChange),
+			pbChange.VectorClock,
 		))
 	}
 
@@ -372,12 +379,6 @@ func fromEdit(pbEdit *api.Operation_Edit) (*operations.Edit, error) {
 	if err != nil {
 		return nil, err
 	}
-	createdAtMapByActor, err := fromCreatedAtMapByActor(
-		pbEdit.CreatedAtMapByActor,
-	)
-	if err != nil {
-		return nil, err
-	}
 	executedAt, err := fromTimeTicket(pbEdit.ExecutedAt)
 	if err != nil {
 		return nil, err
@@ -386,7 +387,7 @@ func fromEdit(pbEdit *api.Operation_Edit) (*operations.Edit, error) {
 		parentCreatedAt,
 		from,
 		to,
-		createdAtMapByActor,
+		pbEdit.VectorClock,
 		pbEdit.Content,
 		pbEdit.Attributes,
 		executedAt,

api/converter/to_pb.go

@@ -246,6 +246,7 @@ func ToChanges(changes []*change.Change) ([]*api.Change, error) {
 			Message:        c.Message(),
 			Operations:     pbOperations,
 			PresenceChange: ToPresenceChange(c.PresenceChange()),
+			VectorClock:    c.VectorClock(),
 		})
 	}
 
@@ -308,13 +309,13 @@ func toRemove(remove *operations.Remove) (*api.Operation_Remove_, error) {
 func toEdit(e *operations.Edit) (*api.Operation_Edit_, error) {
 	return &api.Operation_Edit_{
 		Edit: &api.Operation_Edit{
-			ParentCreatedAt:     ToTimeTicket(e.ParentCreatedAt()),
-			From:                toTextNodePos(e.From()),
-			To:                  toTextNodePos(e.To()),
-			CreatedAtMapByActor: toCreatedAtMapByActor(e.CreatedAtMapByActor()),
-			Content:             e.Content(),
-			Attributes:          e.Attributes(),
-			ExecutedAt:          ToTimeTicket(e.ExecutedAt()),
+			ParentCreatedAt: ToTimeTicket(e.ParentCreatedAt()),
+			From:            toTextNodePos(e.From()),
+			To:              toTextNodePos(e.To()),
+			VectorClock:     e.VectorClock(),
+			Content:         e.Content(),
+			Attributes:      e.Attributes(),
+			ExecutedAt:      ToTimeTicket(e.ExecutedAt()),
 		},
 	}, nil
 }

api/yorkie/v1/admin.proto

@@ -130,6 +130,7 @@ message GetSnapshotMetaRequest {
 message GetSnapshotMetaResponse {
   bytes snapshot = 1;
   int64 lamport = 2  [jstype = JS_STRING];
+  string synced_vector_map = 3;
 }
 
 message SearchDocumentsRequest {